icingaweb2/application
Johannes Meyer 1de2d0c14f Merge branch 'master' into bugfix/rebuild-form-builder-5525
Conflicts:
	application/forms/Authentication/LoginForm.php
	library/Icinga/Test/BaseTestCase.php
	library/Icinga/Web/Form.php
	library/Icinga/Web/Form/Decorator/BootstrapForm.php
2014-07-17 13:15:42 +02:00
..
clicommands Remove license headers from all files 2014-07-15 13:43:52 +02:00
controllers Merge branch 'master' into bugfix/rebuild-form-builder-5525 2014-07-17 13:15:42 +02:00
forms Merge branch 'master' into bugfix/rebuild-form-builder-5525 2014-07-17 13:15:42 +02:00
layouts/scripts Add a HTML renderer for Icinga\Web\Menu 2014-07-03 15:46:46 +02:00
locale Remove encoding suffix from locale identifiers 2014-07-07 09:09:22 +02:00
views Remove license headers from all files 2014-07-15 13:43:52 +02:00