mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2024-12-18 20:33:50 +01:00
b12549831e
# Conflicts: # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/SessionParamsMapper.kt # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt # vector/src/main/java/im/vector/app/features/login/LoginActivity.kt # vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt # vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt |
||
---|---|---|
.. | ||
.gitignore | ||
5151.misc | ||
5398.bugfix | ||
5494.feature | ||
5559.sdk | ||
5825.bugfix | ||
5887.sdk | ||
5906.bugfix | ||
5911.feature | ||
5932.feature | ||
5936.feature | ||
5941.bugfix | ||
5953.misc | ||
5959.bugfix | ||
5965.sdk | ||
5973.doc | ||
5997.misc | ||
6038.misc | ||
6047.feature | ||
46312.misc |