]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into fixing-3942-master
authorThomas Müller <thomas.mueller@tmit.eu>
Fri, 5 Jul 2013 22:02:11 +0000 (00:02 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Fri, 5 Jul 2013 22:02:11 +0000 (00:02 +0200)
commitdad91c156fe63894b145530687ed5b9f84a3e571
treed1a3a67d429185dbc5597e8f485709757211cbc9
parente159cbf527822edc28522df48b0526419835ca29
parentbc1c77664205c8e044cf611a9339773a9f8af2c6
Merge branch 'master' into fixing-3942-master

Conflicts:
apps/files/ajax/upload.php
apps/files/ajax/upload.php
apps/files_sharing/public.php
lib/public/share.php