SchildiChat-android/fastlane
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
..
fastlane/metadata/android [TMP] Automatic upstream merge preparation 2021-02-04 17:00:40 +01:00
metadata/android [TMP] Automatic upstream merge preparation 2021-02-04 17:00:40 +01:00