Eric Lippmann 796cbffbd7 Merge branch 'master' into bugfix/time-formatting-6778 ... Conflicts: modules/monitoring/application/views/scripts/show/components/notifications.phtml		2015-04-15 15:43:39 +02:00
..
icinga	Merge branch 'master' into bugfix/time-formatting-6778	2015-04-15 15:43:39 +02: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