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
..
src	Merge remote-tracking branch 'upstream/master' into sc	2020-11-05 13:15:55 +01:00
.gitignore
build.gradle
lint.xml
proguard-rules.pro