diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2016-09-13 17:55:21 +0100 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2016-09-13 17:55:21 +0100 |
| commit | f274adfe245397a58a167a2ffc266a880d9a8d89 (patch) | |
| tree | d43c062fcb92524e4eefa371f8d6073b7234a8bd | |
| parent | d7bc00c81d9f98d88e77f55056d6cebab90d8f85 (diff) | |
| parent | 576c6ad29292e171a88303e069b4a4a9680cb3bd (diff) | |
Merge remote-tracking branch 'matrix/master'
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | javascript/package.json | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -1,7 +1,7 @@ #!/usr/bin/make -f MAJOR := 1 -MINOR := 1 +MINOR := 2 PATCH := 0 VERSION := $(MAJOR).$(MINOR).$(PATCH) PREFIX ?= /usr/local diff --git a/javascript/package.json b/javascript/package.json index 22232ac..0624409 100644 --- a/javascript/package.json +++ b/javascript/package.json @@ -1,7 +1,7 @@ { "name": "olm", - "version": "1.1.0", - "description": "An implementation of a well known cryptographic ratchet", + "version": "1.2.0", + "description": "An implementation of the Double Ratchet cryptographic ratchet", "main": "olm.js", "files": [ "olm.js", |