Alexander Fuhr 2e24c53224 Merge branch 'master' into feature/localization-form-6073 ... Conflicts: application/forms/Config/GeneralForm.php application/forms/Preference/GeneralForm.php library/Icinga/Application/Web.php		2014-11-05 13:27:45 +01:00
..
clicommands	Throw IcingaException rather than Exception	2014-08-27 16:03:15 +02:00
controllers	Move INI writer classes to the File namespace	2014-10-31 10:54:53 +01:00
forms	Merge branch 'master' into feature/localization-form-6073	2014-11-05 13:27:45 +01:00
layouts/scripts	PHP: avoid short tags <?	2014-10-23 10:44:54 +02:00
locale	Fix spelling issue in german translation catalog	2014-09-02 16:19:45 +02:00
views	PHP: avoid short tags <?	2014-10-23 10:44:54 +02:00