Merge branch 'release/1.7.8' into develop

Conflicts:
	classes/context/Context.class.php
	config/config.inc.php
This commit is contained in:
bnu 2014-12-09 15:13:08 +09:00
commit 4506ea440e
50 changed files with 4086 additions and 126 deletions

View file

@ -126,6 +126,8 @@ class DisplayHandler extends Handler
// call a trigger after display
ModuleHandler::triggerCall('display', 'after', $output);
flushSlowlog();
}
/**