Johannes Meyer 9f127be1dc Merge branch 'master' into feature/setup-wizard-7163 ... Conflicts: application/forms/Config/General/LoggingConfigForm.php		2014-10-17 13:04:59 +02:00
..
ApplicationConfigForm.php	Form::createElements() should add elements instead of returning them	2014-09-03 12:21:31 +02:00
LoggingConfigForm.php	Merge branch 'master' into feature/setup-wizard-7163	2014-10-17 13:04:59 +02:00