]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into move-aborted-upload-detection-into-plugin-master
authorThomas Müller <thomas.mueller@tmit.eu>
Wed, 25 Sep 2013 15:43:25 +0000 (17:43 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Wed, 25 Sep 2013 15:43:25 +0000 (17:43 +0200)

Trivial merge