Merge privileges

2018-12-11 12:52:15 -06:00
parent 65dc1838b9 140b59e79d
commit 66d96454e6
32 changed files with 1115 additions and 210 deletions
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "standard-notes-web",
-  "version": "2.3.18",
+  "version": "2.4.0-beta1",
  "license": "AGPL-3.0-or-later",
  "repository": {
    "type": "git",