Merge branch 'staging' into oo2

This commit is contained in:
ansuz
2018-09-25 11:19:52 -04:00
53 changed files with 4298 additions and 820 deletions

View File

@@ -134,7 +134,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;
});