upstream/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2026-04-27 09:06:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
icingaweb2/modules/monitoring/application
History
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
..
clicommands 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
controllers Merge branch 'master' into feature/link-labels-8458 2015-02-24 08:42:36 +01:00
forms Merge branch 'master' into feature/link-labels-8458 2015-02-24 08:42:36 +01:00
locale fixed transaltions 2015-02-12 11:26:35 +01:00
views Merge branch 'master' into feature/link-labels-8458 2015-02-24 08:42:36 +01:00