SpiritCroc 6626c5b600 Merge commit '8b138e8ff' into sc ...

Change-Id: Icbda29234a03a5498d1aa1b9bbf9bba386f7c2cc

Conflicts:
	vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsController.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/ReadReceiptsItem.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/RoomCategoryItem.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryUserItem.kt

2021-06-20 09:18:03 +02:00

..

sampledata

Split sample step 3: rooms and spaces

2021-05-10 23:07:08 +02:00

signature

…

src

Merge commit '8b138e8ff' into sc

2021-06-20 09:18:03 +02:00

.gitignore

Update .gitignore for gplay builds

2020-08-09 17:02:51 +02:00

build.gradle

Merge commit '8b138e8ff' into sc

2021-06-20 09:18:03 +02:00

lint.xml

Ignore lint false positive

2021-05-18 21:23:50 +02:00

proguard-rules.pro

Initial commit jitsi

2020-08-14 09:31:24 +02:00