mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2024-11-25 10:55:55 +03:00
c73c36eb26
# Conflicts: # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo032.kt # vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderGroup.kt # vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt |
||
---|---|---|
.. | ||
.gitignore | ||
5687.feature | ||
5733.misc | ||
5733.sdk | ||
6213.bugfix | ||
6314.misc | ||
6478.misc | ||
6534.bugfix | ||
6541.misc | ||
6549.bugfix |