Merge pull request #1229 from owncloud/from_live_to_on

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

Mon, 4 Feb 2013 05:55:54 +0000 (21:55 -0800)

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

Mon, 4 Feb 2013 05:55:54 +0000 (21:55 -0800)
author Thomas Müller <thomas.mueller@tmit.eu>
Mon, 4 Feb 2013 05:55:54 +0000 (21:55 -0800)
committer Thomas Müller <thomas.mueller@tmit.eu>
Mon, 4 Feb 2013 05:55:54 +0000 (21:55 -0800)
diff --cc apps/files/js/files.js
Simple merge
diff --cc settings/js/users.js
Simple merge
author	Thomas Müller <thomas.mueller@tmit.eu>
	Mon, 4 Feb 2013 05:55:54 +0000 (21:55 -0800)
committer	Thomas Müller <thomas.mueller@tmit.eu>
	Mon, 4 Feb 2013 05:55:54 +0000 (21:55 -0800)
		1	2
apps/files/js/files.js	patch \|	diff1 \|	diff2 \|	blob \| history
settings/js/users.js	patch \|	diff1 \|	diff2 \|	blob \| history