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
..
object-header.phtml	Introduce new object- and command-view scripts	2015-02-02 16:26:55 +01:00
objects-header.phtml	Header: Add h1 to objects header	2015-02-23 15:12:19 +01:00
servicesummary.phtml	Add proper titles to the servicesummary partial	2015-02-23 17:25:55 +01:00
statusicons.phtml	Introduce new object- and command-view scripts	2015-02-02 16:26:55 +01:00