upstream/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2026-06-11 09:31:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
icingaweb2/library
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
..
Icinga Merge branch 'master' into bugfix/rebuild-form-builder-5525 2014-08-20 13:13:50 +02:00
IcingaVendor vendor/lessphp: we don't need travis.yml right now 2014-06-05 00:15:31 +00:00