Merge pull request #7724 from owncloud/mobile

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

Fri, 28 Mar 2014 09:27:15 +0000 (10:27 +0100)

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

Fri, 28 Mar 2014 09:27:15 +0000 (10:27 +0100)
author Thomas Müller <thomas.mueller@tmit.eu>
Fri, 28 Mar 2014 09:27:15 +0000 (10:27 +0100)
committer Thomas Müller <thomas.mueller@tmit.eu>
Fri, 28 Mar 2014 09:27:15 +0000 (10:27 +0100)
diff --cc apps/files/index.php
Simple merge
diff --cc core/css/styles.css
Simple merge
diff --cc core/js/js.js
Simple merge
diff --cc core/js/share.js
Simple merge
diff --cc core/templates/layout.user.php
Simple merge
author	Thomas Müller <thomas.mueller@tmit.eu>
	Fri, 28 Mar 2014 09:27:15 +0000 (10:27 +0100)
committer	Thomas Müller <thomas.mueller@tmit.eu>
	Fri, 28 Mar 2014 09:27:15 +0000 (10:27 +0100)
		1	2
apps/files/index.php	patch \|	diff1 \|	diff2 \|	blob \| history
core/css/styles.css	patch \|	diff1 \|	diff2 \|	blob \| history
core/js/js.js	patch \|	diff1 \|	diff2 \|	blob \| history
core/js/share.js	patch \|	diff1 \|	diff2 \|	blob \| history
core/templates/layout.user.php	patch \|	diff1 \|	diff2 \|	blob \| history