Johannes Meyer 1cbe2451a8 Merge branch 'master' into feature/setup-wizard-7163 ... Conflicts: application/forms/Config/Resource/StatusdatResourceForm.php		2014-10-08 16:34:31 +02:00
..
icinga	Merge branch 'master' into feature/setup-wizard-7163	2014-10-08 16:34:31 +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