icingaweb2/modules
Johannes Meyer 11063495b2 Merge branch 'master' into bugfix/rebuild-form-builder-5525
Conflicts:
	modules/monitoring/application/controllers/ConfigController.php
2014-08-21 10:22:16 +02:00
..
doc doc: fix translate calls w/ sprintf 2014-08-19 16:22:54 +02:00
monitoring Merge branch 'master' into bugfix/rebuild-form-builder-5525 2014-08-21 10:22:16 +02:00
test Remove missed echo instruction for debug purposes 2014-06-30 14:06:11 +02:00
translation Relax locale code validation to just a format check 2014-08-21 10:07:07 +02:00