c8a56d63e9
# Conflicts: # vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt |
||
---|---|---|
.. | ||
.gitignore | ||
5426.feature | ||
5473.bugfix | ||
5517.misc | ||
5586.feature |
c8a56d63e9
# Conflicts: # vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt |
||
---|---|---|
.. | ||
.gitignore | ||
5426.feature | ||
5473.bugfix | ||
5517.misc | ||
5586.feature |