Eric Lippmann 0e7ca591ec Merge branch 'master' into bugfix/commands-6593 ... Conflicts: application/forms/Preference/GeneralForm.php application/views/helpers/FormDateTime.php modules/monitoring/application/forms/Command/CommandForm.php		2014-09-08 10:16:05 +02:00
..
clicommands	Throw IcingaException rather than Exception	2014-08-27 16:03:15 +02:00
controllers	Merge branch 'master' into bugfix/commands-6593	2014-09-08 10:16:05 +02:00
forms	Timezone detection: Add discoverd value to preference form	2014-09-05 15:24:13 +02:00
layouts/scripts	layout: change header element order	2014-09-05 13:22:48 +02:00
locale	Fix spelling issue in german translation catalog	2014-09-02 16:19:45 +02:00
views	Merge branch 'master' into bugfix/commands-6593	2014-09-08 10:16:05 +02:00