mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2024-12-14 10:34:45 +01:00
40de685f1a
# Conflicts: # vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt # vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt |
||
---|---|---|
.. | ||
.gitignore | ||
5151.misc | ||
5494.feature | ||
5559.sdk | ||
5825.bugfix | ||
5911.feature | ||
5936.feature | ||
5941.bugfix | ||
5953.misc | ||
5959.bugfix | ||
5965.sdk | ||
5997.misc | ||
46312.misc |