]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into fs-backend-registration
authorThomas Müller <thomas.mueller@tmit.eu>
Thu, 3 Apr 2014 15:04:16 +0000 (17:04 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Thu, 3 Apr 2014 15:04:16 +0000 (17:04 +0200)
commit14a53819777f5cb829aa15f8d749c9ae71d39b4e
treebd32bfd88a60ac20a7d5a00a559fffb705a9279e
parentc0ebc1dfb1108b7cbe0fa134def00aa6ce0066b3
parente2969062ca172b46713653ac243bb849a54ca7d7
Merge branch 'master' into fs-backend-registration

Conflicts:
apps/files_external/templates/settings.php
apps/files_external/lib/webdav.php