Merge pull request #7915 from owncloud/replace-personalblock

author Vincent Petry <pvince81@owncloud.com>

Tue, 1 Apr 2014 09:20:16 +0000 (11:20 +0200)

committer Vincent Petry <pvince81@owncloud.com>

Tue, 1 Apr 2014 09:20:16 +0000 (11:20 +0200)
author Vincent Petry <pvince81@owncloud.com>
Tue, 1 Apr 2014 09:20:16 +0000 (11:20 +0200)
committer Vincent Petry <pvince81@owncloud.com>
Tue, 1 Apr 2014 09:20:16 +0000 (11:20 +0200)
diff --cc core/css/styles.css
Simple merge
diff --cc settings/css/settings.css
Simple merge
author	Vincent Petry <pvince81@owncloud.com>
	Tue, 1 Apr 2014 09:20:16 +0000 (11:20 +0200)
committer	Vincent Petry <pvince81@owncloud.com>
	Tue, 1 Apr 2014 09:20:16 +0000 (11:20 +0200)
		1	2
core/css/styles.css	patch \|	diff1 \|	diff2 \|	blob \| history
settings/css/settings.css	patch \|	diff1 \|	diff2 \|	blob \| history