Johannes Meyer 11063495b2 Merge branch 'master' into bugfix/rebuild-form-builder-5525 ... Conflicts: modules/monitoring/application/controllers/ConfigController.php		2014-08-21 10:22:16 +02:00
..
helpers	Revert "Do not use htmlspecialchars in view scripts"	2014-07-23 12:29:27 +02:00
scripts	Merge branch 'master' into bugfix/rebuild-form-builder-5525	2014-08-21 10:22:16 +02:00