mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2024-12-13 01:56:47 +01:00
38ae03893f
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 |
||
---|---|---|
.. | ||
sampledata | ||
signature | ||
src | ||
.gitignore | ||
build.gradle | ||
lint.xml | ||
proguard-rules.pro |