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
..
src	Merge tag 'v1.1.13' into sc	2021-07-19 16:10:57 +02:00
.gitignore	first commit	2018-10-03 17:58:12 +02:00
build.gradle	Bump kluent-android from 1.67 to 1.68	2021-07-12 23:07:08 +00:00
lint.xml	Set severity of ObsoleteSdkInt to error	2020-08-18 00:46:37 +02:00
proguard-rules.pro	Remove dependency to org.greenrobot.eventbus library	2021-01-05 18:56:24 +01:00