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

first commit

2018-10-03 17:58:12 +02:00

build.gradle

Trick to fix a change due to upgrade to build-tools 4.1.0 (?)

2020-10-13 23:05:33 +02:00

lint.xml

Set severity of ObsoleteSdkInt to error

2020-08-18 00:46:37 +02:00

proguard-rules.pro

Fix / Serialization issues

2020-07-02 19:26:05 +02:00