]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'oc_preview' of github.com:owncloud/core into oc_preview
authorJan-Christoph Borchardt <hey@jancborchardt.net>
Wed, 14 Aug 2013 11:01:52 +0000 (13:01 +0200)
committerJan-Christoph Borchardt <hey@jancborchardt.net>
Wed, 14 Aug 2013 11:01:52 +0000 (13:01 +0200)

Trivial merge