50b042ee98
# Conflicts: # vector/src/main/java/im/vector/app/features/home/room/list/home/NewChatBottomSheet.kt |
||
---|---|---|
.. | ||
sampledata | ||
src | ||
.gitignore | ||
build.gradle |
50b042ee98
# Conflicts: # vector/src/main/java/im/vector/app/features/home/room/list/home/NewChatBottomSheet.kt |
||
---|---|---|
.. | ||
sampledata | ||
src | ||
.gitignore | ||
build.gradle |