ariskotsomitopoulos 8a862d006e Merge branch 'develop' into feature/aris/thread_live_thread_list ... # Conflicts: # vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt		2022-03-15 14:21:04 +01:00
..
android/sdk	Merge branch 'develop' into feature/aris/thread_live_thread_list	2022-03-15 14:21:04 +01:00
androidsdk/crypto/data	Standardise spelling and casing of homeserver	2021-07-15 15:58:50 +01:00