mirrors
/
olm
mirror of https://git.matrix.org/git/olm.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'matrix/master'

logging_enabled
Mark Haines 2016-09-13 17:55:21 +01:00
parent d7bc00c81d 576c6ad292
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
MAJOR := 1
MINOR := 1
MINOR := 2
PATCH := 0
VERSION := $(MAJOR).$(MINOR).$(PATCH)
PREFIX ?= /usr/local

4
javascript/package.json
View File

@ -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",