diff options
author | manuroe <manu@matrix.org> | 2016-11-07 17:21:39 +0100 |
---|---|---|
committer | manuroe <manu@matrix.org> | 2016-11-07 17:21:39 +0100 |
commit | 5d1b66c350ac017613982f904b896750766654de (patch) | |
tree | a290c557e7881f7eb48cbdd568a4f3e43cb749c6 /Makefile | |
parent | 62f52806702b799b9e25e7cdf07be1c8a31325a2 (diff) | |
parent | f6c05be8c5d35e725a8a2ed5ad661398ac9f8cd2 (diff) |
Merge remote-tracking branch 'origin/master' into olmkit
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1,7 +1,7 @@ #!/usr/bin/make -f -MAJOR := 1 -MINOR := 3 +MAJOR := 2 +MINOR := 0 PATCH := 0 VERSION := $(MAJOR).$(MINOR).$(PATCH) PREFIX ?= /usr/local @@ -46,6 +46,7 @@ JS_POST := javascript/olm_outbound_group_session.js \ DOCS := tracing/README.html \ docs/megolm.html \ docs/olm.html \ + docs/signing.html \ README.html \ CHANGELOG.html |