]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into readdir-strict-equals
authorGeorg Ehrke <developer@georgehrke.com>
Mon, 19 Aug 2013 15:30:56 +0000 (17:30 +0200)
committerGeorg Ehrke <developer@georgehrke.com>
Mon, 19 Aug 2013 15:30:56 +0000 (17:30 +0200)
1  2 
apps/files_external/lib/google.php
lib/files/storage/common.php

Simple merge
Simple merge