Skip to content

Commit

Permalink
version++
Browse files Browse the repository at this point in the history
  • Loading branch information
manuroe committed Jul 26, 2016
1 parent 9d924a5 commit ea938d1
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 25 deletions.
8 changes: 8 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
Changes in Console in 0.6.10 (2016-07-26)
===============================================

Improvements:
* Upgrade MatrixKit version (v0.3.12).
* Enable VoIP for 1:1 room
* Add Markdown support

Changes in Console in 0.6.9 (2016-07-04)
===============================================

Expand Down
2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ target "matrixConsole" do

# Different flavours of pods to MatrixKit
# The tagged version on which this version of Console has been built
pod 'MatrixKit', '~> 0.3.10'
pod 'MatrixKit', '0.3.12'

# The lastest release available on the CocoaPods repository
#pod 'MatrixKit'
Expand Down
29 changes: 6 additions & 23 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -32,36 +32,19 @@ PODS:
- HPGrowingTextView (1.1)
- libjingle_peerconnection (11177.2.0)
- libPhoneNumber-iOS (0.8.15)
- MatrixKit (0.3.11):
- MatrixKit (0.3.12):
- DTCoreText (~> 1.6.17)
- GHMarkdownParser (~> 0.1.2)
- HPGrowingTextView (~> 1.1)
- libPhoneNumber-iOS (~> 0.8.14)
- MatrixSDK (~> 0.6.10)
- MatrixSDK (0.6.10):
- MatrixSDK (0.6.11):
- AFNetworking (~> 3.1.0)

DEPENDENCIES:
- GBDeviceInfo (~> 4.1.0)
- libjingle_peerconnection
- MatrixKit (from `https://github.com/matrix-org/matrix-ios-kit.git`, branch `develop`)
- MatrixSDK (from `https://github.com/matrix-org/matrix-ios-sdk.git`, branch `develop`)

EXTERNAL SOURCES:
MatrixKit:
:branch: develop
:git: https://github.com/matrix-org/matrix-ios-kit.git
MatrixSDK:
:branch: develop
:git: https://github.com/matrix-org/matrix-ios-sdk.git

CHECKOUT OPTIONS:
MatrixKit:
:commit: 64005d78c28e366e2cfb04fa2ccd94d0c823e945
:git: https://github.com/matrix-org/matrix-ios-kit.git
MatrixSDK:
:commit: a4a3f60896d5a73ae3042b2293bf7f16ed213993
:git: https://github.com/matrix-org/matrix-ios-sdk.git
- MatrixKit (= 0.3.12)

SPEC CHECKSUMS:
AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
Expand All @@ -72,9 +55,9 @@ SPEC CHECKSUMS:
HPGrowingTextView: 88a716d97fb853bcb08a4a08e4727da17efc9b19
libjingle_peerconnection: 3458f646ddd61f08a9f3a0c43fb01fff5c165eb8
libPhoneNumber-iOS: 62a740e1ea5741060f5cec0f788b52071115cf31
MatrixKit: 711c7b8c1a0751432de3b718f948d25b736925be
MatrixSDK: 39f5fd09a729e88ce7f159a66f2d2515c7252664
MatrixKit: e5c86154bb7995d063e2c35665fe57e252abde91
MatrixSDK: 22c13b3d2e16954944977eb1093c4e6926a339a5

PODFILE CHECKSUM: d9ab8bf7469dcc53c7c63ec60f4f0c014077a0c2
PODFILE CHECKSUM: 0d78bfa7b92072e5a76464d7ca99662427e89bed

COCOAPODS: 1.0.1
2 changes: 1 addition & 1 deletion matrixConsole/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.6.9</string>
<string>0.6.10</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down

0 comments on commit ea938d1

Please sign in to comment.