SpiritCroc 3b2f09e80d Merge remote-tracking branch 'AquaWolf/feature/conversations' into sc ... Change-Id: Idbbe13f56d988900ade365c3d582bd03799d245c Conflicts: vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt		2021-05-26 10:55:56 +02:00
..
sampledata	Split sample step 3: rooms and spaces	2021-05-10 23:07:08 +02:00
signature
src	Merge remote-tracking branch 'AquaWolf/feature/conversations' into sc	2021-05-26 10:55:56 +02:00
.gitignore
build.gradle	Merge remote-tracking branch 'AquaWolf/feature/conversations' into sc	2021-05-26 10:55:56 +02:00
lint.xml	Ignore lint false positive	2021-05-18 21:23:50 +02:00
proguard-rules.pro