Merge pull request #7151 from owncloud/user-jquery

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

Tue, 3 Jun 2014 13:04:30 +0000 (15:04 +0200)

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

Tue, 3 Jun 2014 13:04:30 +0000 (15:04 +0200)
author Thomas Müller <thomas.mueller@tmit.eu>
Tue, 3 Jun 2014 13:04:30 +0000 (15:04 +0200)
committer Thomas Müller <thomas.mueller@tmit.eu>
Tue, 3 Jun 2014 13:04:30 +0000 (15:04 +0200)
diff --cc core/css/styles.css
Simple merge
diff --cc core/js/js.js
Simple merge
diff --cc settings/css/settings.css
Simple merge
author	Thomas Müller <thomas.mueller@tmit.eu>
	Tue, 3 Jun 2014 13:04:30 +0000 (15:04 +0200)
committer	Thomas Müller <thomas.mueller@tmit.eu>
	Tue, 3 Jun 2014 13:04:30 +0000 (15:04 +0200)
		1	2
core/css/styles.css	patch \|	diff1 \|	diff2 \|	blob \| history
core/js/js.js	patch \|	diff1 \|	diff2 \|	blob \| history
settings/css/settings.css	patch \|	diff1 \|	diff2 \|	blob \| history