]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into navigation
authorJan-Christoph Borchardt <hey@jancborchardt.net>
Thu, 31 Jan 2013 14:35:20 +0000 (15:35 +0100)
committerJan-Christoph Borchardt <hey@jancborchardt.net>
Thu, 31 Jan 2013 14:35:20 +0000 (15:35 +0100)
1  2 
apps/files/appinfo/app.php
apps/files/css/files.css

Simple merge
Simple merge