Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
matrix-org
Olm
Commits
b185229c
Commit
b185229c
authored
Jan 18, 2017
by
Richard van der Hoff
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Prep v2.2.1
parent
1014712f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
6 deletions
+12
-6
CHANGELOG.rst
CHANGELOG.rst
+6
-0
Makefile
Makefile
+1
-1
OLMKit.podspec
OLMKit.podspec
+1
-1
android/olm-sdk/build.gradle
android/olm-sdk/build.gradle
+3
-3
javascript/package.json
javascript/package.json
+1
-1
No files found.
CHANGELOG.rst
View file @
b185229c
Changes in `2.2.1 <http://matrix.org/git/olm/commit/?h=2.2.1>`_
===============================================================
The only change in this release is a fix to the build scripts for the
Objective-C wrapper which made it impossible to release the 2.2.0 CocoaPod.
Changes in `2.2.0 <http://matrix.org/git/olm/commit/?h=2.2.0>`_
===============================================================
...
...
Makefile
View file @
b185229c
...
...
@@ -2,7 +2,7 @@
MAJOR
:=
2
MINOR
:=
2
PATCH
:=
0
PATCH
:=
1
VERSION
:=
$(MAJOR)
.
$(MINOR)
.
$(PATCH)
PREFIX
?=
/usr/local
BUILD_DIR
:=
build
...
...
OLMKit.podspec
View file @
b185229c
...
...
@@ -3,7 +3,7 @@ Pod::Spec.new do |s|
# The libolm version
MAJOR
=
2
MINOR
=
2
PATCH
=
0
PATCH
=
1
s
.
name
=
"OLMKit"
s
.
version
=
"
#{
MAJOR
}
.
#{
MINOR
}
.
#{
PATCH
}
"
...
...
android/olm-sdk/build.gradle
View file @
b185229c
...
...
@@ -9,9 +9,9 @@ android {
defaultConfig
{
minSdkVersion
11
targetSdkVersion
21
versionCode
22
0
versionName
"2.2.
0
"
version
"2.2.
0
"
versionCode
22
1
versionName
"2.2.
1
"
version
"2.2.
1
"
testInstrumentationRunner
"android.support.test.runner.AndroidJUnitRunner"
}
buildTypes
{
...
...
javascript/package.json
View file @
b185229c
{
"name"
:
"olm"
,
"version"
:
"2.2.
0
"
,
"version"
:
"2.2.
1
"
,
"description"
:
"An implementation of the Double Ratchet cryptographic ratchet"
,
"main"
:
"olm.js"
,
"files"
:
[
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment