Merge branch 'staging' into todo

config.example.js

@@ -248,7 +248,7 @@ module.exports = {
     /*  Setting this value to anything other than true will cause file upload
      *  attempts to be rejected outright.
      */
-    enableUploads: false,
+    enableUploads: true,
 
     /*  If you have enabled file upload, you have the option of restricting it
      *  to a list of users identified by their public keys. If this value is set

customize.dist/template.js

@@ -112,7 +112,7 @@ $(function () {
                 ])
             ])
         ]),
-        h('div.version-footer', "CryptPad v1.11.0 (Lutin)")
+        h('div.version-footer', "CryptPad v1.12.0 (Minotaur)")
     ]));
 
     var pathname = location.pathname;

package.json

@@ -1,7 +1,7 @@
 {
   "name": "cryptpad",
   "description": "realtime collaborative visual editor with zero knowlege server",
-  "version": "1.11.0",
+  "version": "1.12.0",
   "dependencies": {
     "chainpad-server": "^1.0.1",
     "express": "~4.10.1",