41d859dc5b
# Conflicts: # vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt |
||
---|---|---|
.. | ||
attachment-viewer | ||
core-utils | ||
diff-match-patch | ||
jsonviewer | ||
multipicker | ||
ui-styles |
41d859dc5b
# Conflicts: # vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt |
||
---|---|---|
.. | ||
attachment-viewer | ||
core-utils | ||
diff-match-patch | ||
jsonviewer | ||
multipicker | ||
ui-styles |