Eric Lippmann 4ca1eaa7ce Merge branch 'bugfix/rebuild-form-builder-5525' into bugfix/commands-6593 ... Conflicts: library/Icinga/Web/Form.php modules/monitoring/application/forms/Config/SecurityForm.php		2014-08-28 13:58:02 +02:00
..
Icinga	Merge branch 'bugfix/rebuild-form-builder-5525' into bugfix/commands-6593	2014-08-28 13:58:02 +02:00
IcingaVendor	vendor/lessphp: we don't need travis.yml right now	2014-06-05 00:15:31 +00:00