]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge pull request #5540 from owncloud/scanner-enhancments-master
authorThomas Müller <thomas.mueller@tmit.eu>
Tue, 5 Nov 2013 07:58:42 +0000 (23:58 -0800)
committerThomas Müller <thomas.mueller@tmit.eu>
Tue, 5 Nov 2013 07:58:42 +0000 (23:58 -0800)
Scanner enhancments master

1  2 
apps/files_sharing/lib/cache.php
lib/private/files/cache/cache.php

Simple merge
Simple merge