nextcloud/apps
Michael Gapczynski fbcf62389c Merge branch 'master' into external_storage_ui_feedback
Conflicts:
	apps/files_external/lib/webdav.php
2013-01-09 21:49:21 -05:00
..
files [tx-robot] updated from transifex 2013-01-10 00:05:53 +01:00
files_encryption [tx-robot] updated from transifex 2013-01-10 00:05:53 +01:00
files_external Merge branch 'master' into external_storage_ui_feedback 2013-01-09 21:49:21 -05:00
files_sharing [tx-robot] updated from transifex 2013-01-10 00:05:53 +01:00
files_versions [tx-robot] updated from transifex 2013-01-10 00:05:53 +01:00
user_ldap [tx-robot] updated from transifex 2013-01-10 00:05:53 +01:00
user_webdavauth [tx-robot] updated from transifex 2013-01-10 00:05:53 +01:00