Merge pull request #7190 from owncloud/appconfig-legacy-apps

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

Tue, 18 Feb 2014 17:10:22 +0000 (18:10 +0100)

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

Tue, 18 Feb 2014 17:10:22 +0000 (18:10 +0100)
author Thomas Müller <thomas.mueller@tmit.eu>
Tue, 18 Feb 2014 17:10:22 +0000 (18:10 +0100)
committer Thomas Müller <thomas.mueller@tmit.eu>
Tue, 18 Feb 2014 17:10:22 +0000 (18:10 +0100)
diff --cc apps/files_encryption/lib/util.php
Simple merge
diff --cc apps/files_encryption/tests/share.php
Simple merge
diff --cc apps/files_trashbin/lib/trashbin.php
Simple merge
author	Thomas Müller <thomas.mueller@tmit.eu>
	Tue, 18 Feb 2014 17:10:22 +0000 (18:10 +0100)
committer	Thomas Müller <thomas.mueller@tmit.eu>
	Tue, 18 Feb 2014 17:10:22 +0000 (18:10 +0100)
		1	2
apps/files_encryption/lib/util.php	patch \|	diff1 \|	diff2 \|	blob \| history
apps/files_encryption/tests/share.php	patch \|	diff1 \|	diff2 \|	blob \| history
apps/files_trashbin/lib/trashbin.php	patch \|	diff1 \|	diff2 \|	blob \| history