]> source.dussan.org Git - nextcloud-server.git/commit
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)
commit4a05e8820f5ff376c7e6076aee0b2c2e2c9cc94c
tree8486ff4dbafd1c6e892695b37e7346057759a413
parent05a8766cbc5826a89e52248994e3e2d0b6c57be5
parentd713948d3f85a6e0a369bf1a9052ce563250e3da
Merge branch 'master' into external_storage_ui_feedback
apps/files_external/lib/config.php
lib/files/storage/common.php