From bb314927d27791a5448aeff46be8b7bb36aa2342 Mon Sep 17 00:00:00 2001
From: manuroe <manu@matrix.org>
Date: Tue, 26 Jul 2016 14:53:29 +0200
Subject: [PATCH] version++

---
 CHANGES.rst       | 11 +++++++++++
 Podfile           |  2 +-
 Podfile.lock      | 36 +++++++++++-------------------------
 Vector/Info.plist |  2 +-
 4 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 105b577ea..fec1fee56 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,14 @@
+Changes in Vector iOS in 0.1.12 (2016-07-26)
+===============================================
+
+Improvements:
+ * Upgrade MatrixKit version (v0.3.12).
+ * Enable VoIP for 1:1 room #454.
+ 
+Bug fixes:
+ * Confirmation prompt before opping someone to same power level #461.
+ * Room Settings: The room privacy setting text doesn't fit in phone mode #429.
+
 Changes in Vector iOS in 0.1.12 (2016-07-15)
 ===============================================
 
diff --git a/Podfile b/Podfile
index 34d954e27..6c4926dd7 100644
--- a/Podfile
+++ b/Podfile
@@ -8,7 +8,7 @@ target "Vector" do
 
 # Different flavours of pods to MatrixKit
 # The tagged version on which this version of Vector has been built
-pod 'MatrixKit', '0.3.11'
+pod 'MatrixKit', '0.3.12'
 
 # The lastest release available on the CocoaPods repository 
 #pod 'MatrixKit'
diff --git a/Podfile.lock b/Podfile.lock
index 3dcde1947..fc29bca68 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -31,37 +31,22 @@ PODS:
   - GHMarkdownParser (0.1.2)
   - GoogleAnalytics (3.14.0)
   - HPGrowingTextView (1.1)
-  - libPhoneNumber-iOS (0.8.14)
-  - MatrixKit (0.3.11):
+  - libjingle_peerconnection (11177.2.0)
+  - libPhoneNumber-iOS (0.8.15)
+  - 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)
   - GoogleAnalytics
-  - 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: 97ce46f9bd6d5aa24bb7c6d75cce7cd44d8772dc
-    :git: https://github.com/matrix-org/matrix-ios-kit.git
-  MatrixSDK:
-    :commit: c40327d49a2f6485cd1e9aacbf4ecf98f15e6551
-    :git: https://github.com/matrix-org/matrix-ios-sdk.git
+  - libjingle_peerconnection
+  - MatrixKit (= 0.3.12)
 
 SPEC CHECKSUMS:
   AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
@@ -71,10 +56,11 @@ SPEC CHECKSUMS:
   GHMarkdownParser: 14cbf59d0ab9450017d843dffd4a3ef691e5bd77
   GoogleAnalytics: 9be1afdb8deeac4bb5f13ca7f7d3b9db2a1f43dc
   HPGrowingTextView: 88a716d97fb853bcb08a4a08e4727da17efc9b19
-  libPhoneNumber-iOS: fb165271ebe7fb32e55da97b83219382f2f9d409
-  MatrixKit: 711c7b8c1a0751432de3b718f948d25b736925be
-  MatrixSDK: 39f5fd09a729e88ce7f159a66f2d2515c7252664
+  libjingle_peerconnection: 3458f646ddd61f08a9f3a0c43fb01fff5c165eb8
+  libPhoneNumber-iOS: 62a740e1ea5741060f5cec0f788b52071115cf31
+  MatrixKit: e5c86154bb7995d063e2c35665fe57e252abde91
+  MatrixSDK: 22c13b3d2e16954944977eb1093c4e6926a339a5
 
-PODFILE CHECKSUM: 9934e23b9bf229801b392898e91b2d5e635b7b1b
+PODFILE CHECKSUM: 33afb8666c6570b3cf0c991450b878e1a6d9366e
 
 COCOAPODS: 1.0.1
diff --git a/Vector/Info.plist b/Vector/Info.plist
index 360d55c2b..a730fb940 100644
--- a/Vector/Info.plist
+++ b/Vector/Info.plist
@@ -36,7 +36,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.1.12</string>
+	<string>0.1.13</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>