upstream/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2026-04-29 10:09:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
icingaweb2/modules/monitoring/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 CLI/monitoring/list: fix DataView-related exception 2014-07-31 17:24:56 +02:00
controllers Merge branch 'master' into bugfix/rebuild-form-builder-5525 2014-08-20 13:13:50 +02:00
forms Make use if 'ignore´ instead of explicitly unsetting array keys 2014-08-12 13:57:28 +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