sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
nextcloud-server/apps/files_external/templates
History
Michael Gapczynski 702c27b0e6 Merge branch 'master' into external_storage_ui_feedback 
Conflicts:
	apps/files_external/js/settings.js
	apps/files_external/lib/smb.php
	apps/files_external/templates/settings.php
	lib/files/storage/common.php
 		2013-02-19 19:12:14 +07:00
..
settings.php Merge branch 'master' into external_storage_ui_feedback 2013-02-19 19:12:14 +07:00