Johannes Meyer ae9e5a40cc Merge branch 'master' into bugfix/rebuild-form-builder-5525 ... Conflicts: application/forms/Preference/GeneralForm.php		2014-09-08 08:46:53 +02:00
..
Icinga	Merge branch 'master' into bugfix/rebuild-form-builder-5525	2014-09-08 08:46:53 +02:00
IcingaVendor	vendor/lessphp: we don't need travis.yml right now	2014-06-05 00:15:31 +00:00