Johannes Meyer bb7972aa39 Merge branch 'master' into bugfix/rebuild-form-builder-5525 ... Conflicts: application/controllers/AuthenticationController.php application/controllers/ConfigController.php application/forms/Authentication/LoginForm.php application/forms/Preference/GeneralForm.php modules/monitoring/application/controllers/ChartController.php		2014-08-20 13:13:50 +02:00
..
helpers	Remove license headers from all files	2014-07-15 13:43:52 +02:00
scripts	Merge branch 'master' into bugfix/rebuild-form-builder-5525	2014-08-20 13:13:50 +02:00