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
..
ISSUE_TEMPLATE	Merge pull request #4257 from opusforlife2/FR_template	2021-11-16 13:34:44 +01:00
workflows	Merge branch 'develop' into feature/aris/threads	2022-01-11 14:09:49 +02:00
dependabot.yml	letting dependabot ignore the zxing dependency, it appears the author does not intend to support older versions of android in the new versions of the library	2021-10-28 16:21:17 +01:00
PULL_REQUEST_TEMPLATE.md	Update location of sign off documentation	2021-10-15 10:27:22 +02:00