upstream/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2026-06-14 19:10:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
icingaweb2/application
History
Johannes Meyer bb7972aa39 Merge branch 'master' into bugfix/rebuild-form-builder-5525 
Conflicts:
	application/controllers/AuthenticationController.php
	application/controllers/ConfigController.php
	application/forms/Authentication/LoginForm.php
	application/forms/Preference/GeneralForm.php
	modules/monitoring/application/controllers/ChartController.php
2014-08-20 13:13:50 +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-08-20 13:13:50 +02:00
forms Merge branch 'master' into bugfix/rebuild-form-builder-5525 2014-08-20 13:13:50 +02:00
layouts/scripts favicon: add link type 2014-08-19 12:25:14 +02:00
locale Remove encoding suffix from locale identifiers 2014-07-07 09:09:22 +02:00
views Merge branch 'master' into bugfix/rebuild-form-builder-5525 2014-08-20 13:13:50 +02:00