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
..
icinga	Merge branch 'master' into feature/link-labels-8458	2015-02-24 08:42:36 +01:00
vendor	Fix SVG bound calculation for tooltips in Firefox	2014-09-04 09:53:57 +02:00
helpers.js	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
icinga.js	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