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
..
Icinga	Merge branch 'master' into bugfix/commands-6593	2014-09-08 10:16:05 +02:00
IcingaVendor	vendor/lessphp: we don't need travis.yml right now	2014-06-05 00:15:31 +00:00