]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into move-storages
authorMichael Gapczynski <mtgap@owncloud.com>
Thu, 23 May 2013 14:25:12 +0000 (10:25 -0400)
committerMichael Gapczynski <mtgap@owncloud.com>
Thu, 23 May 2013 14:25:12 +0000 (10:25 -0400)
commit30330b4343b5bca82b95d9df4a13651c8e91063d
tree68979fb843a309e43803935f53afe74fab2844e4
parent3b6d850e592bbc6db9d67d25ee700c0730c84376
parent698862519de6b364da6c20a97d8c546204e80f3d
Merge branch 'master' into move-storages

Conflicts:
tests/lib/files/view.php
lib/files/cache/scanner.php
lib/files/view.php
tests/lib/files/view.php