Merge branch 'soon' into staging

This commit is contained in:
ansuz
2018-09-20 11:44:56 -04:00
10 changed files with 2056 additions and 67 deletions

View File

@@ -130,7 +130,7 @@ define(function() {
// spontaneously, resulting in the deletion of the entire folder's content.
// We highly recommend to keep them disabled until they are stable enough to be enabled
// by default by the CryptPad developers.
config.disableSharedFolders = true;
config.disableSharedFolders = false;
return config;
});