Johannes Meyer bf470125c3 Merge branch 'master' into feature/create-missing-directories-when-creating-inis-8219 ... Conflicts: modules/monitoring/library/Monitoring/MonitoringWizard.php		2015-01-30 16:21:42 +01:00
..
clicommands	icingacli web serve: Fix "PHP Notice: Use of undefined constant ICINGA_LIBDIR"	2014-11-14 16:02:17 +01:00
controllers	Merge branch 'master' into feature/create-missing-directories-when-creating-inis-8219	2015-01-30 16:21:42 +01:00
fonts	ifont: Reorganize files and drop use less attributes	2015-01-29 11:25:37 +01:00
forms	Merge branch 'master' into feature/create-missing-directories-when-creating-inis-8219	2015-01-30 16:21:42 +01:00
layouts/scripts	layout: Do not duplicate code from layout/menu.phtml in navigation.phtml	2015-01-22 13:47:45 +01:00
locale	Update pt_BR translation	2014-12-03 09:40:52 -02:00
views	Merge branch 'master' into feature/create-missing-directories-when-creating-inis-8219	2015-01-30 16:21:42 +01:00