mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2025-03-28 16:59:01 +03:00
# Conflicts: # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineEventDecryptor.kt # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt |
||
---|---|---|
.. | ||
.gitignore | ||
5575.sdk | ||
5592.bugfix | ||
5652.bugfix | ||
5772.feature | ||
5773.misc | ||
5774.misc | ||
5805.misc | ||
5811.feature | ||
5812.sdk | ||
5814.feature | ||
5816.sdk | ||
5832.misc | ||
5836.doc | ||
5847.bugfix |