]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of https://github.com/nextcloud/server 4094/head
authorMarius Blüm <marius@lineone.io>
Mon, 27 Mar 2017 14:32:45 +0000 (16:32 +0200)
committerMarius Blüm <marius@lineone.io>
Mon, 27 Mar 2017 14:32:45 +0000 (16:32 +0200)

Trivial merge