SpiritCroc 58d99e10a0 Merge remote-tracking branch 'upstream/master' into sc ... Change-Id: I004362e70c17eba5828e10ec9bf8b37568f64f01 Conflicts: vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt vector/src/main/res/menu/menu_timeline.xml		2020-11-05 13:15:55 +01:00
..
sampledata	Room profile: make link in room topic clickable	2020-01-16 16:36:56 +01:00
signature	…
src	Merge remote-tracking branch 'upstream/master' into sc	2020-11-05 13:15:55 +01:00
.gitignore	Update .gitignore for gplay builds	2020-08-09 17:02:51 +02:00
build.gradle	Merge remote-tracking branch 'upstream/master' into sc	2020-11-05 13:15:55 +01:00
lint.xml	Lint: fixes UseCompatTextViewDrawableXml issues	2020-10-08 09:35:24 +02:00
proguard-rules.pro	Initial commit jitsi	2020-08-14 09:31:24 +02:00