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
..
codeStyles	Merge tag 'v1.1.7' into sc	2021-05-12 16:01:36 +02:00
copyright	Share the same Copyright header. Disabled for XML files	2020-02-05 17:48:59 +01:00
dictionaries	RawService.getWellknown() now takes a domain instead of a matrixId as parameter	2021-06-30 09:20:08 +02:00