icingaweb2/public
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
..
css Merge branch 'master' into bugfix/rebuild-form-builder-5525 2014-07-17 13:15:42 +02:00
img CSS/tree: add CSS support for simple tree views 2014-06-20 12:32:19 +02:00
js Remove license headers from all files 2014-07-15 13:43:52 +02:00
index.php Remove license headers from all files 2014-07-15 13:43:52 +02:00