]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into permanent-share-icons
authorJan-Christoph Borchardt <hey@jancborchardt.net>
Mon, 28 Jan 2013 18:39:51 +0000 (19:39 +0100)
committerJan-Christoph Borchardt <hey@jancborchardt.net>
Mon, 28 Jan 2013 18:39:51 +0000 (19:39 +0100)

Trivial merge