SpiritCroc c2ce787310 Merge tag 'v1.0.16' into sc ... Change-Id: Ia65e40a4acaee3f26a5680f05b3ae1bf8327d4d6 Conflicts: vector/src/main/AndroidManifest.xml vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt		2021-02-04 17:10:15 +01:00
..
src	Merge tag 'v1.0.16' into sc	2021-02-04 17:10:15 +01:00
.gitignore	…
build.gradle	Merge pull request #2616 from vector-im/feature/ons/android_11_migration	2021-01-22 17:17:04 +01:00
lint.xml	Set severity of ObsoleteSdkInt to error	2020-08-18 00:46:37 +02:00
proguard-rules.pro	Remove dependency to org.greenrobot.eventbus library	2021-01-05 18:56:24 +01:00