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
..
sampledata
signature
src	Merge tag 'v1.0.5' into sc	2020-08-22 11:23:45 +02:00
.gitignore	Update .gitignore for gplay builds	2020-08-09 17:02:51 +02:00
build.gradle	Merge tag 'v1.0.5' into sc	2020-08-22 11:23:45 +02:00
lint.xml	Set severity of ObsoleteSdkInt to error	2020-08-18 00:46:37 +02:00
proguard-rules.pro	Initial commit jitsi	2020-08-14 09:31:24 +02:00