Johannes Meyer d1917ad2b4 Merge branch 'master' into bugfix/do-not-use-count-queries-for-emptiness-checks-9632 ... Conflicts: modules/monitoring/application/views/scripts/service/history.phtml		2015-08-03 16:46:27 +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 'feature/basic-auth-9660'	2015-07-30 15:05:07 +02:00
fonts	ifont: Add new icons up|down|right|left-small	2015-07-24 10:13:26 +02:00
forms	Hide non-essential form fields when configuring LDAP user group backends	2015-07-31 15:56:13 +02:00
layouts/scripts	Rename Notifiation::getMessages() to popMessages()	2015-07-30 13:45:39 +02:00
locale	Remove exclamation mark from the notification "Authentication order updated!"'s translations	2015-04-27 14:13:26 +02:00
views	Merge branch 'master' into bugfix/do-not-use-count-queries-for-emptiness-checks-9632	2015-08-03 16:46:27 +02:00
VERSION	Change VERSION's format	2015-06-03 18:08:54 +02:00