]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into update-parent-storage-mtime
authorRobin Appelman <icewind@owncloud.com>
Wed, 30 Oct 2013 12:41:10 +0000 (13:41 +0100)
committerRobin Appelman <icewind@owncloud.com>
Wed, 30 Oct 2013 12:41:10 +0000 (13:41 +0100)
commitc9f3f2874f3136342965a1d255d030de87725519
tree8a9ca523992d2b461d71c3483bd1e0b31dae4f7a
parent654b0daf0145b216d81347325b17cf522a49ec81
parent4c964cbbbe2b92d6220410cda5e7905e529fc713
Merge branch 'master' into update-parent-storage-mtime

Conflicts:
lib/private/files/cache/updater.php
lib/private/files/cache/updater.php
tests/lib/files/cache/updater.php