mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2024-12-17 11:59:55 +01:00
61f5f81305
# Conflicts: # library/ui-strings/src/main/res/values/strings.xml # vector/src/main/AndroidManifest.xml # vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt # vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionsListHeaderView.kt # vector/src/main/res/layout/fragment_settings_devices.xml |
||
---|---|---|
.. | ||
.gitignore | ||
5424.bugfix | ||
6776.bugfix | ||
6779.misc | ||
7035.misc | ||
7045.wip | ||
7077.wip | ||
7102.bugfix | ||
7103.bugfix | ||
7121.wip | ||
7122.bugfix | ||
7142.misc |