# Conflicts: # vector/src/main/java/im/vector/app/features/home/room/list/home/NewChatBottomSheet.kt |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| 5424.bugfix | ||
| 6776.bugfix | ||
| 7035.misc | ||
| 7077.wip | ||
| 7102.bugfix | ||
| 7103.bugfix | ||
| 7122.bugfix | ||
| 7132.bugfix | ||
| 7142.misc | ||
# Conflicts: # vector/src/main/java/im/vector/app/features/home/room/list/home/NewChatBottomSheet.kt |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| 5424.bugfix | ||
| 6776.bugfix | ||
| 7035.misc | ||
| 7077.wip | ||
| 7102.bugfix | ||
| 7103.bugfix | ||
| 7122.bugfix | ||
| 7132.bugfix | ||
| 7142.misc | ||