Johannes Meyer a55cced039 Merge branch 'master' into feature/custom-menu-items-5600 ... Conflicts: modules/monitoring/application/views/scripts/list/comments.phtml modules/monitoring/application/views/scripts/list/downtimes.phtml		2015-09-25 14:12:43 +02:00
..
Preferences	Merge branch 'master' into feature/custom-menu-items-5600	2015-09-25 14:12:43 +02:00
Preferences.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