Johannes Meyer 956efe5ef9 Merge branch 'master' into feature/link-labels-8458 ... Conflicts: application/views/scripts/config/application.phtml application/views/scripts/config/module.phtml application/views/scripts/config/modules.phtml library/Icinga/Web/Widget/Dashboard/Dashlet.php modules/monitoring/application/controllers/TimelineController.php		2015-02-24 08:42:36 +01:00
..
css	Merge branch 'master' into feature/link-labels-8458	2015-02-24 08:42:36 +01:00
font	ifont: Reorganize files and drop use less attributes	2015-01-29 11:25:37 +01: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/link-labels-8458	2015-02-24 08:42:36 +01:00
error_norewrite.html	Webserver\Apache2: show hint with no mod_rewrite	2014-11-11 22:02:40 +01:00
index.php	Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL	2015-02-04 10:52:27 +01:00