updated version to resolve conflict

2018-02-22 13:05:00 +01:00 · 2018-02-22 13:05:00 +01:00 · d2b3e078d5
parent c409cac280
commit d2b3e078d5
1 changed files with 1 additions and 1 deletions
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
  "name": "cryptpad",
  "description": "realtime collaborative visual editor with zero knowlege server",
-  "version": "1.25.0",
+  "version": "1.26.0",
  "license": "AGPL-3.0-or-later",
  "dependencies": {
    "chainpad-server": "^2.0.0",