Bernd Erk 903219b302 Merge branch 'master' into feature/redesign-7144 ... Conflicts: library/Icinga/Web/Menu.php public/css/icinga/menu.less		2014-11-13 21:11:36 +01:00
..
doc	Enable icon font	2014-11-13 20:08:58 +01:00
monitoring	Merge branch 'master' into feature/redesign-7144	2014-11-13 21:11:36 +01:00
setup	Enable icon font	2014-11-13 20:08:58 +01:00
test	Merge branch 'master' into feature/remove-autotools-files-7505	2014-11-13 10:52:40 +01:00
translation	Add support for "core" modules and make the setup module such a module	2014-11-10 17:34:49 +01:00