]> source.dussan.org Git - nextcloud-server.git/commit
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)
commit3d5c7ca2456849b7227cf24bed2bc0be4db1a555
tree95ca38a92c8d84d49063e3f852467feae770be96
parentad044eb88861ebf2cefedc993634a85bb4697cd2
parent5bf7791b4212c6dba2ce7289841c71f8177cfa3f
Merge branch 'master' into navigation
core/css/styles.css
core/js/js.js
settings/css/settings.css
settings/js/apps.js