mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2024-12-17 20:08:32 +01:00
82cde166db
# Conflicts: # vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageHelper.kt # vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.kt # vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt # vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt |
||
---|---|---|
.. | ||
.gitignore | ||
5426.feature | ||
5517.misc | ||
5586.feature |