Johannes Meyer 1cbe2451a8 Merge branch 'master' into feature/setup-wizard-7163 ... Conflicts: application/forms/Config/Resource/StatusdatResourceForm.php		2014-10-08 16:34:31 +02:00
..
css	Merge branch 'master' into feature/setup-wizard-7163	2014-10-08 16:34:31 +02:00
img	Use an icon with better interpolation in our header bar	2014-09-04 17:41:48 +02:00
js	Update navigation when the url of the main column changes	2014-10-01 17:47:21 +02:00
index.php	Remove license headers from all files	2014-07-15 13:43:52 +02:00