Merge pull request #15734 from owncloud/add-deprecate-tags

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

Tue, 21 Apr 2015 21:57:49 +0000 (23:57 +0200)

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

Tue, 21 Apr 2015 21:57:49 +0000 (23:57 +0200)
author Thomas Müller <thomas.mueller@tmit.eu>
Tue, 21 Apr 2015 21:57:49 +0000 (23:57 +0200)
committer Thomas Müller <thomas.mueller@tmit.eu>
Tue, 21 Apr 2015 21:57:49 +0000 (23:57 +0200)
diff --cc lib/public/backgroundjob.php
Simple merge
diff --cc lib/public/db.php
Simple merge
diff --cc lib/public/files.php
Simple merge
diff --cc lib/public/user.php
Simple merge
author	Thomas Müller <thomas.mueller@tmit.eu>
	Tue, 21 Apr 2015 21:57:49 +0000 (23:57 +0200)
committer	Thomas Müller <thomas.mueller@tmit.eu>
	Tue, 21 Apr 2015 21:57:49 +0000 (23:57 +0200)
		1	2
lib/public/backgroundjob.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/public/db.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/public/files.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/public/user.php	patch \|	diff1 \|	diff2 \|	blob \| history