ariskotsomitopoulos 3bd21d04d8 Merge branch 'develop' into feature/aris/threads ... # Conflicts: # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt # tools/check/forbidden_strings_in_code.txt		2022-01-11 14:09:49 +02:00
..
ui-styles	Merge branch 'develop' into feature/aris/threads	2022-01-11 14:09:49 +02:00