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
..
css	Merge branch 'master' into bugfix/commands-6593	2014-09-08 10:16:05 +02:00
img	Use an icon with better interpolation in our header bar	2014-09-04 17:41:48 +02:00
js	Timezone detection: Set cookie expiration to 1 day	2014-09-05 15:24:13 +02:00
index.php	Remove license headers from all files	2014-07-15 13:43:52 +02:00