Johannes Meyer ae9e5a40cc Merge branch 'master' into bugfix/rebuild-form-builder-5525 ...

Conflicts:
	application/forms/Preference/GeneralForm.php

2014-09-08 08:46:53 +02:00

..

ActionController.php

ActionController: no benchmark for no renderer

2014-09-02 16:49:28 +02:00

BasePreferenceController.php

Adjust Preferences/GeneralForm to use handleRequest() &. Co.

2014-09-05 10:21:24 +02:00

ControllerTabCollector.php

Remove license headers from all files

2014-07-15 13:43:52 +02:00

ModuleActionController.php

Remove license headers from all files

2014-07-15 13:43:52 +02:00