Eric Lippmann 9e0d6657b7 Merge branch 'bugfix/rebuild-form-builder-5525' into bugfix/commands-6593 ... Conflicts: application/forms/Preference/GeneralForm.php		2014-09-15 09:27:07 +02:00
..
clicommands	Throw IcingaException rather than Exception	2014-08-27 16:03:15 +02:00
controllers	Merge branch 'master' into bugfix/rebuild-form-builder-5525	2014-09-09 16:03:22 +02:00
forms	Fix createElements() not returning self where applicable	2014-09-09 13:24:39 +02:00
layouts/scripts	Only display custom menu renders on XHR requests and not in regular HTML	2014-09-09 15:33:42 +02:00
locale	Fix spelling issue in german translation catalog	2014-09-02 16:19:45 +02:00
views	Merge branch 'bugfix/rebuild-form-builder-5525' into bugfix/commands-6593	2014-09-15 09:27:07 +02:00