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

2017-12-21 15:53:16 +01:00
parent 3177fd7857 590e77aafa
commit d1d75f2f25
13 changed files with 264 additions and 23 deletions
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
    "jshint": "~2.9.1",
    "less": "2.7.1",
    "lesshint": "^4.5.0",
-    "selenium-webdriver": "^2.53.1"
+    "selenium-webdriver": "^3.6.0"
  },
  "scripts": {
    "start": "node server.js",