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
..
check_code_quality.sh	textSize *sp -> style	2021-06-15 10:30:54 +02:00
forbidden_strings_in_code_sdk.txt	Fix Copyright mention	2020-10-08 15:11:01 +02:00
forbidden_strings_in_code.txt	Merge branch 'develop' into feature/aris/threads	2022-01-11 14:09:49 +02:00
forbidden_strings_in_layout.txt	Fix code quality issues	2021-12-26 00:48:11 +02:00
forbidden_strings_in_resources.txt	Cleanup	2021-06-14 21:46:05 +02:00