SpiritCroc 38ae03893f Merge tag 'v1.3.1' into sc ...

Change-Id: I1e5589c78e3398867519b1dbd326581cbe60baea

Conflicts:
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt
	vector/src/main/res/drawable/ic_jump_to_unread.xml
	vector/src/main/res/drawable/ic_radio_on.xml
	vector/src/main/res/drawable/ic_voice_message_locked.xml
	vector/src/main/res/drawable/ic_voice_mic_recording.xml

2021-09-30 09:27:15 +02:00

..

src

Merge tag 'v1.3.0' into sc

2021-09-29 09:55:02 +02:00

.gitignore

…

build.gradle

Merge tag 'v1.3.1' into sc

2021-09-30 09:27:15 +02:00

proguard-rules.pro

Remove dependency to org.greenrobot.eventbus library

2021-01-05 18:56:24 +01:00