]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into external_storage_ui_feedback
authorMichael Gapczynski <mtgap@owncloud.com>
Mon, 25 Feb 2013 22:56:40 +0000 (17:56 -0500)
committerMichael Gapczynski <mtgap@owncloud.com>
Mon, 25 Feb 2013 22:56:40 +0000 (17:56 -0500)
1  2 
apps/files_external/lib/config.php
lib/files/storage/common.php

Simple merge
Simple merge