SpiritCroc 8497a307a1 Merge tag 'v1.1.13' into sc ... Change-Id: Icc97ef8699b1cc96447369121f3c88582ac651bc Conflicts: matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomFooterItem.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt		2021-07-19 16:10:57 +02:00
..
ui-styles	Merge tag 'v1.1.13' into sc	2021-07-19 16:10:57 +02:00