ariskotsomitopoulos 324856d700 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		2022-05-17 11:55:07 +03:00
..
src	Merge branch 'develop' into feature/aris/threads_post_release_ui_improvements	2022-05-17 11:55:07 +03:00
.gitignore	Create module for ui-styles	2021-06-15 12:23:54 +02:00
build.gradle	Remove 3rd party waveform library.	2022-03-02 17:46:09 +03:00