Merge branch 'sdk_reference_aggregation' into dm_verif_incoming_timeline

CHANGES.md

@@ -1,4 +1,25 @@
-Changes in RiotX 0.10.0 (2019-XX-XX)
+Changes in RiotX 0.11.0 (2019-XX-XX)
+===================================================
+
+Features ✨:
+ -
+
+Improvements 🙌:
+ -
+
+Other changes:
+ -
+
+Bugfix 🐛:
+ -
+
+Translations 🗣:
+ -
+
+Build 🧱:
+ -
+
+Changes in RiotX 0.10.0 (2019-12-10)
 ===================================================
 
 Features ✨:
@@ -15,12 +36,6 @@ Bugfix 🐛:
  - "ban" event are not rendered correctly (#716)
  - Fix crash when rotating screen in Room timeline
 
-Translations 🗣:
- -
-
-Build 🧱:
- -
-
 Changes in RiotX 0.9.1 (2019-12-05)
 ===================================================
 

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/ReferencesAggregatedSummary.kt

@@ -27,3 +27,4 @@ class ReferencesAggregatedSummary(
         val sourceEvents: List<String>,
         val localEchos: List<String>
 )
+

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageVerificationAcceptContent.kt

@@ -20,8 +20,8 @@ import com.squareup.moshi.JsonClass
 import im.vector.matrix.android.api.session.events.model.RelationType
 import im.vector.matrix.android.api.session.events.model.toContent
 import im.vector.matrix.android.api.session.room.model.relation.RelationDefaultContent
-import im.vector.matrix.android.internal.crypto.verification.VerificationInfoAcceptFactory
 import im.vector.matrix.android.internal.crypto.verification.VerificationInfoAccept
+import im.vector.matrix.android.internal.crypto.verification.VerificationInfoAcceptFactory
 import timber.log.Timber
 
 @JsonClass(generateAdapter = true)

vector/build.gradle

@@ -15,7 +15,7 @@ androidExtensions {
 }
 
 ext.versionMajor = 0
-ext.versionMinor = 10
+ext.versionMinor = 11
 ext.versionPatch = 0
 
 static def getGitTimestamp() {