From fd0c908b6ad9bd0f6b8e2ffbe350f2e09ab499da Mon Sep 17 00:00:00 2001
From: manuroe <manu@matrix.org>
Date: Tue, 1 Aug 2017 14:41:56 +0200
Subject: [PATCH] version++

---
 CHANGES.rst     | 33 +++++++++++++++++++++++++++++++++
 Podfile         |  2 +-
 Podfile.lock    | 14 +++++++-------
 Riot/Info.plist |  4 ++--
 4 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 75251b1602..ae929c6bd1 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,36 @@
+Changes in 0.5.0 (2017-08-01)
+===============================================
+
+Improvements:
+ * Upgrade MatrixKit version (v0.6.0).
+ * MXKRoomViewController: Merge of membership events (MELS).
+ * Language can be changed at runtime from the settings.
+ * Add the m.audio attachments support (https://github.com/vector-im/riot-ios#1102).
+ * Improve opening of a room. No more white screen with a loading wheel.
+ * Remove MXKAlert, use UIAlertViewController instead.
+ * UX Rework: Add edition mode support to the home page (vector-im/riot-meta#75).
+ * RoomTableViewCell: Replace the direct chat icon with a green ring.
+ * People: Use the user directory api from the homeserver to search people (vector-im/riot-meta#95).
+ * Add support of matrix.to links to users (#1410).
+ * RoomVC: Send button: Fix its width adjustability to support other languages.
+
+Translations:
+ * Note: Only Dutch, German and French have been added to Riot. Other translations are not complete yet.
+ * Dutch, thanks to @nvbln (PR #1317).
+ * German, thanks to @krombel, @esackbauer, @Bamstam.
+ * French, thanks to @krombel, @kaiyou, @babolivier and @bestspyever.
+ * Russian, thanks to @gabrin, @Andrey and @shvchk.
+ * Simplified Chinese, thanks to @tonghuix.
+ * Latvian, thanks to @lauris79.
+ * Spanish, thanks to @javierquevedo.
+ 
+Bug fixes:
+ * Home: On iOS <= 9.0, the rooms collection scrolls to the left on room edition.
+ * Home: Fix the flickering effects observed when user edits a room on iOS < 10.
+ * Camera preview is broken after a second try (#686).
+ * Fix the wrong preview layout on iPad described in PR #1372.
+ * Room settings: ticks are badly refreshed (#681).
+
 Changes in 0.4.3 (2017-07-05)
 ===============================================
 
diff --git a/Podfile b/Podfile
index dee294bb5a..f4bd2bd3d5 100644
--- a/Podfile
+++ b/Podfile
@@ -8,7 +8,7 @@ target "Riot" do
 
 # Different flavours of pods to MatrixKit
 # The tagged version on which this version of Riot has been built
-pod 'MatrixKit', '0.5.2'
+pod 'MatrixKit', '0.6.0'
 
 # The lastest release available on the CocoaPods repository 
 #pod 'MatrixKit'
diff --git a/Podfile.lock b/Podfile.lock
index 34664183df..065d199345 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -39,13 +39,13 @@ PODS:
   - GZIP (1.1.1)
   - HPGrowingTextView (1.1)
   - libPhoneNumber-iOS (0.9.10)
-  - MatrixKit (0.5.2):
+  - MatrixKit (0.6.0):
     - cmark (~> 0.24.1)
     - DTCoreText (~> 1.6.17)
     - HPGrowingTextView (~> 1.1)
     - libPhoneNumber-iOS (~> 0.9.10)
-    - MatrixSDK (= 0.8.2)
-  - MatrixSDK (0.8.2):
+    - MatrixSDK (= 0.9.0)
+  - MatrixSDK (0.9.0):
     - AFNetworking (~> 3.1.0)
     - GZIP (~> 1.1.1)
   - OLMKit (2.2.2):
@@ -63,7 +63,7 @@ DEPENDENCIES:
   - DTCoreText
   - GBDeviceInfo (~> 4.3.0)
   - GoogleAnalytics
-  - MatrixKit (= 0.5.2)
+  - MatrixKit (= 0.6.0)
   - OLMKit
   - Realm (~> 2.8.1)
   - WebRTC (= 58.17.16937)
@@ -78,12 +78,12 @@ SPEC CHECKSUMS:
   GZIP: f8beb59597f651e6970a45b816508a9c6d700b77
   HPGrowingTextView: 88a716d97fb853bcb08a4a08e4727da17efc9b19
   libPhoneNumber-iOS: f721ae4d5854bce60934f9fb9b0b28e8e68913cb
-  MatrixKit: daad23e5724d8f26a44a322f4d259a26b614ddc6
-  MatrixSDK: 1f9b5fa6334485c431884d2d2ea9ac5f65557528
+  MatrixKit: 5fbccca031922678711eac07abea2e06a5d7c21d
+  MatrixSDK: ee1e381e93d0a53baa465e0caf5217c1ef34a274
   OLMKit: b9d8c0ffee9ea8c45bc0aaa9afb47f93fba7efbd
   Realm: 3601ef091c8c499a31101d8563b991e75546cdce
   WebRTC: 1e9a85bf75509eec44be6478c64e9de65ac82332
 
-PODFILE CHECKSUM: ba9311a74b4af32f75db5053d87c9f7181a42d17
+PODFILE CHECKSUM: 93f7160baaf90769979c2c6fee52db7969d6fba0
 
 COCOAPODS: 1.2.1
diff --git a/Riot/Info.plist b/Riot/Info.plist
index 5346ea0887..b956fe0973 100644
--- a/Riot/Info.plist
+++ b/Riot/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.4.3</string>
+	<string>0.5.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.4.3</string>
+	<string>0.5.0</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<true/>
 	<key>ITSEncryptionExportComplianceCode</key>