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

2017-04-25 17:22:07 +02:00
parent d985b144cc 3309087277
commit 2a417ddae8
12 changed files with 74 additions and 17 deletions
--- a/www/examples/file/main.js
+++ b/www/examples/file/main.js
@@ -45,7 +45,6 @@ define([
            };
            Toolbar.create($bar, null, null, null, null, configTb);
        });
-
    };

    Cryptpad.ready(function (err, anv) {