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
..
androidTest	Merge branch 'develop' into feature/aris/threads	2022-01-10 13:26:57 +02:00
debug/java/org/matrix/android/sdk/internal/network/interceptors	Big annoying commit: execute command ./gradlew ktlintFormat - Fix "colon-spacing"	2021-10-01 13:31:15 +02:00
main	Merge branch 'develop' into feature/aris/threads	2022-01-11 14:09:49 +02:00
release/java/org/matrix/android/sdk/internal/network/interceptors	Big annoying commit: execute command ./gradlew ktlintFormat - Fix "colon-spacing"	2021-10-01 13:31:15 +02:00
sharedTest/java/org/matrix/android/sdk/test/shared	Fix Copyright mention in SDK code	2020-10-08 15:04:55 +02:00
test/java/org/matrix/android/sdk	using correct license for matrix-sdk test	2021-10-27 16:42:35 +01:00