SchildiChat-android/library
ariskotsomitopoulos 40de685f1a Merge branch 'develop' into feature/aris/threads_post_release_ui_improvements
# 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
2022-05-12 14:41:38 +03:00
..
attachment-viewer Formats entire project 2022-04-21 11:50:15 +02:00
core-utils Fix warning: w: '-Xopt-in' is deprecated and will be removed in a future release, please use -opt-in instead 2022-05-09 22:08:24 +02:00
diff-match-patch Global import optimization 2022-04-12 16:06:27 +02:00
jsonviewer Try to workaround Dependabot issue #5961 2022-05-09 11:40:53 +02:00
multipicker Merge pull request #5805 from vector-im/task/eric/format-project 2022-04-21 12:43:28 +02:00
ui-styles Add badge in thread list filtering 2022-05-04 19:24:31 +03:00