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
pdf	Remove license headers from all files	2014-07-15 13:43:52 +02:00
vendor	Rename tipsy stylesheet file type to css and add license	2014-09-03 17:01:07 +02:00