SpiritCroc 7b4b5be759 Merge tag 'v1.0.5' into sc ...

Conflicts:
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
	vector/src/main/res/layout/item_room.xml
	vector/src/main/res/layout/item_timeline_event_file_stub.xml
	vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
	vector/src/main/res/values-v21/styles_login.xml
	vector/src/main/res/values/theme_dark.xml
	vector/src/main/res/values/theme_light.xml
	vector/src/main/res/values/theme_status.xml

2020-08-22 11:23:45 +02:00

..

src

Merge tag 'v1.0.5' into sc

2020-08-22 11:23:45 +02:00

.gitignore

…

build.gradle

Build Jitsi lib version android-sdk-2.9.3, commit abcbbbea12e3ef88012b14723bb8cd42dbefc988

2020-08-14 21:33:25 +02:00

lint.xml

Set severity of ObsoleteSdkInt to error

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

proguard-rules.pro

…