Merge pull request #21288 from owncloud/deprecated_helper_mimetypes

author Thomas Müller <thomas.mueller@tmit.eu>

Fri, 18 Dec 2015 14:23:05 +0000 (15:23 +0100)

committer Thomas Müller <thomas.mueller@tmit.eu>

Fri, 18 Dec 2015 14:23:05 +0000 (15:23 +0100)
author Thomas Müller <thomas.mueller@tmit.eu>
Fri, 18 Dec 2015 14:23:05 +0000 (15:23 +0100)
committer Thomas Müller <thomas.mueller@tmit.eu>
Fri, 18 Dec 2015 14:23:05 +0000 (15:23 +0100)
diff --cc lib/private/helper.php
Simple merge
diff --cc tests/lib/helper.php
Simple merge
author	Thomas Müller <thomas.mueller@tmit.eu>
	Fri, 18 Dec 2015 14:23:05 +0000 (15:23 +0100)
committer	Thomas Müller <thomas.mueller@tmit.eu>
	Fri, 18 Dec 2015 14:23:05 +0000 (15:23 +0100)
		1	2
lib/private/helper.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/lib/helper.php	patch \|	diff1 \|	diff2 \|	blob \| history