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
pdf	Remove license headers from all files	2014-07-15 13:43:52 +02:00
vendor	Rename tipsy stylesheet file type to css and add license	2014-09-03 17:01:07 +02:00