Johannes Meyer 9f127be1dc Merge branch 'master' into feature/setup-wizard-7163 ... Conflicts: application/forms/Config/General/LoggingConfigForm.php		2014-10-17 13:04:59 +02:00
..
css	Style welcome page and fill placeholders	2014-10-17 11:19:04 +02:00
img	Use an icon with better interpolation in our header bar	2014-09-04 17:41:48 +02:00
js	Merge branch 'master' into feature/setup-wizard-7163	2014-10-17 13:04:59 +02:00
index.php	Remove license headers from all files	2014-07-15 13:43:52 +02:00