From 49ca6aca98faa90732b9fb47d614209f74f3642d Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Tue, 6 Sep 2016 22:26:24 +0100 Subject: [PATCH 1/2] Bump version numbers to 1.2.0 --- Makefile | 2 +- javascript/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ad97c5d..2299eeb 100644 --- a/Makefile +++ b/Makefile @@ -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..d896e19 100644 --- a/javascript/package.json +++ b/javascript/package.json @@ -1,6 +1,6 @@ { "name": "olm", - "version": "1.1.0", + "version": "1.2.0", "description": "An implementation of a well known cryptographic ratchet", "main": "olm.js", "files": [ From 576c6ad29292e171a88303e069b4a4a9680cb3bd Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Tue, 6 Sep 2016 22:46:58 +0100 Subject: [PATCH 2/2] call double ratchet what it is --- javascript/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/javascript/package.json b/javascript/package.json index d896e19..0624409 100644 --- a/javascript/package.json +++ b/javascript/package.json @@ -1,7 +1,7 @@ { "name": "olm", "version": "1.2.0", - "description": "An implementation of a well known cryptographic ratchet", + "description": "An implementation of the Double Ratchet cryptographic ratchet", "main": "olm.js", "files": [ "olm.js",