Johannes Meyer ae9e5a40cc Merge branch 'master' into bugfix/rebuild-form-builder-5525 ... Conflicts: application/forms/Preference/GeneralForm.php		2014-09-08 08:46:53 +02:00
..
css	Merge branch 'master' into bugfix/rebuild-form-builder-5525	2014-09-08 08:46:53 +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