]> source.dussan.org Git - nextcloud-server.git/commitdiff
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)
Conflicts:
lib/private/files/cache/updater.php

1  2 
lib/private/files/cache/updater.php
tests/lib/files/cache/updater.php

Simple merge
Simple merge