SpiritCroc 4b63a9f939 Merge tag 'v1.3.9' into sc ...

Change-Id: I26834af19e0b02887f288b6441ced6d993cb8861

Conflicts:
	vector/src/fdroid/java/im/vector/app/di/FlavorModule.kt
	vector/src/gplay/java/im/vector/app/push/fcm/EmbeddedDistrib.kt
	vector/src/main/java/im/vector/app/VectorApplication.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewEvents.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.kt
	vector/src/main/res/drawable/ic_shield_custom.xml
	vector/src/main/res/drawable/ic_shield_trusted.xml

2021-12-05 13:46:55 +01:00

..

src/main

Merge tag 'v1.3.9' into sc

2021-12-05 13:46:55 +01:00

.gitignore

Initial implementation of multipicker.

2020-03-20 12:12:59 +03:00

build.gradle

No need to add explicit dependencies on stdlib, this is added by the gradle plugin since 1.4

2021-10-19 19:06:27 +02:00

consumer-rules.pro

Initial implementation of multipicker.

2020-03-20 12:12:59 +03:00

proguard-rules.pro

Initial implementation of multipicker.

2020-03-20 12:12:59 +03:00