icingaweb2/modules
Thomas Gelf 57caacb93f Merge branch 'feature/fanzzzy-5481' into feature/master-1
Conflicts:
	application/controllers/AuthenticationController.php
	application/controllers/ErrorController.php
	application/views/scripts/authentication/login.phtml
	library/Icinga/Application/ApplicationBootstrap.php
	library/Icinga/Web/Controller/ActionController.php
	library/Icinga/Web/Hook.php
	library/Icinga/Web/Widget/Dashboard.php
2014-03-04 09:42:25 +00:00
..
doc Modules/Doc: Add Syntax highlighting for PHP code 2014-02-11 17:04:58 +01:00
monitoring Merge branch 'feature/fanzzzy-5481' into feature/master-1 2014-03-04 09:42:25 +00:00
translation Refactor translation cli commands and implement po-file compilation 2014-01-30 10:51:10 +01:00