]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into navigation
authorJan-Christoph Borchardt <hey@jancborchardt.net>
Thu, 31 Jan 2013 18:28:25 +0000 (19:28 +0100)
committerJan-Christoph Borchardt <hey@jancborchardt.net>
Thu, 31 Jan 2013 18:28:25 +0000 (19:28 +0100)
1  2 
core/css/styles.css
core/js/js.js
settings/css/settings.css
settings/js/apps.js

Simple merge
diff --cc core/js/js.js
Simple merge
Simple merge
Simple merge