Merge pull request #7817 from owncloud/app-navigation-for-apps

author Morris Jobke <hey@morrisjobke.de>

Tue, 1 Apr 2014 19:38:43 +0000 (21:38 +0200)

committer Morris Jobke <hey@morrisjobke.de>

Tue, 1 Apr 2014 19:38:43 +0000 (21:38 +0200)
author Morris Jobke <hey@morrisjobke.de>
Tue, 1 Apr 2014 19:38:43 +0000 (21:38 +0200)
committer Morris Jobke <hey@morrisjobke.de>
Tue, 1 Apr 2014 19:38:43 +0000 (21:38 +0200)
diff --cc core/css/apps.css
Simple merge
diff --cc settings/css/settings.css
Simple merge
author	Morris Jobke <hey@morrisjobke.de>
	Tue, 1 Apr 2014 19:38:43 +0000 (21:38 +0200)
committer	Morris Jobke <hey@morrisjobke.de>
	Tue, 1 Apr 2014 19:38:43 +0000 (21:38 +0200)
		1	2
core/css/apps.css	patch \|	diff1 \|	diff2 \|	blob \| history
settings/css/settings.css	patch \|	diff1 \|	diff2 \|	blob \| history