Merge pull request #20744 from owncloud/oc_helper-getMimeType-cleanup

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

Thu, 26 Nov 2015 11:37:25 +0000 (12:37 +0100)

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

Thu, 26 Nov 2015 11:37:25 +0000 (12:37 +0100)
author Thomas Müller <thomas.mueller@tmit.eu>
Thu, 26 Nov 2015 11:37:25 +0000 (12:37 +0100)
committer Thomas Müller <thomas.mueller@tmit.eu>
Thu, 26 Nov 2015 11:37:25 +0000 (12:37 +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>
	Thu, 26 Nov 2015 11:37:25 +0000 (12:37 +0100)
committer	Thomas Müller <thomas.mueller@tmit.eu>
	Thu, 26 Nov 2015 11:37:25 +0000 (12:37 +0100)
		1	2
lib/private/helper.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/lib/helper.php	patch \|	diff1 \|	diff2 \|	blob \| history