upstream/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2026-02-03 20:40:06 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
icingaweb2/application/views/scripts/error
History
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
..
error.phtml Merge branch 'feature/fanzzzy-5481' into feature/master-1 2014-03-04 09:42:25 +00:00