Johannes Meyer 1d6ad6df21 Merge branch 'master' into feature/custom-menu-items-5600 ... Conflicts: modules/monitoring/configuration.php		2015-09-15 13:31:30 +02: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/custom-menu-items-5600	2015-09-15 13:31:30 +02:00
fonts	font: Add icon-circle	2015-09-07 10:21:17 +02:00
forms	Merge branch 'master' into feature/custom-menu-items-5600	2015-09-15 13:31:30 +02:00
layouts/scripts	Use the new navigation to render the menu	2015-09-04 10:53:01 +02:00
locale	Update locale it_IT	2015-09-01 23:02:52 +02:00
views	NavigationController: Implement removeAction()	2015-09-07 16:02:12 +02:00
VERSION	Change VERSION's format	2015-06-03 18:08:54 +02:00