timoreo/olm
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'matrix/master'

Browse source
This commit is contained in:
Mark Haines 2016-09-13 17:55:21 +01:00
commit f274adfe24
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -1,7 +1,7 @@
#!/usr/bin/make -f #!/usr/bin/make -f
MAJOR := 1 MAJOR := 1
MINOR := 1 MINOR := 2
PATCH := 0 PATCH := 0
VERSION := $(MAJOR).$(MINOR).$(PATCH) VERSION := $(MAJOR).$(MINOR).$(PATCH)
PREFIX ?= /usr/local PREFIX ?= /usr/local

4
javascript/package.json
View file

@ -1,7 +1,7 @@
{ {
"name": "olm", "name": "olm",
"version": "1.1.0", "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", "main": "olm.js",
"files": [ "files": [
"olm.js", "olm.js",