Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

2017-05-04 16:08:21 +02:00
parent a190c99426 2232518c64
commit 4335b050af
6 changed files with 339 additions and 78 deletions
--- a/customize.dist/application_config.js
+++ b/customize.dist/application_config.js
@@ -37,5 +37,8 @@ define(function() {

    config.enableHistory = true;

+    //config.enablePinLimit = true;
+    //config.pinLimit = 1000;
+
    return config;
 });