Eric Lippmann 7cfc78558d Merge branch 'master' into feature/secure-modules-9644 ... Conflicts: library/Icinga/Exception/IcingaException.php		2015-07-28 13:42:02 +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/secure-modules-9644	2015-07-28 13:42:02 +02:00
fonts	ifont: Add new icons up|down|right|left-small	2015-07-24 10:13:26 +02:00
forms	Merge branch 'master' into feature/secure-modules-9644	2015-07-28 13:42:02 +02:00
layouts/scripts	Form: Process request parameter _frameUpload	2015-07-21 15:22:24 +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 feature/secure-modules-9644	2015-07-28 13:42:02 +02:00
VERSION	Change VERSION's format	2015-06-03 18:08:54 +02:00