From 49ca6aca98faa90732b9fb47d614209f74f3642d Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Tue, 6 Sep 2016 22:26:24 +0100
Subject: [PATCH] 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": [