]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge pull request #11570 from owncloud/backport-11408-master
authorLukas Reschke <lukas@owncloud.com>
Wed, 15 Oct 2014 19:21:45 +0000 (21:21 +0200)
committerLukas Reschke <lukas@owncloud.com>
Wed, 15 Oct 2014 19:21:45 +0000 (21:21 +0200)
Backport 11408 master

1  2 
settings/css/settings.css
settings/routes.php

Simple merge
Simple merge