Benoit Marty ebda12dd76 Merge branch 'develop' into feature/attachment_process		2020-02-17 19:22:50 +01:00
..
androidTest/java/im/vector/matrix/android	Merge pull request #1026 from vector-im/feature/crypto_service_renaming	2020-02-17 19:21:02 +01:00
debug/java/im/vector/matrix/android/internal/network/interceptors	Fix ktlint issue automatically by running ./ktlint --android -v -F	2019-10-09 15:24:05 +02:00
main	Merge branch 'develop' into feature/attachment_process	2020-02-17 19:22:50 +01:00
release/java/im/vector/matrix/android/internal/network/interceptors	Fix compilation issue in release	2019-06-28 14:08:38 +02:00
test/java/im/vector/matrix/android	Coroutine sequencer: use semaphore	2020-02-14 19:37:51 +01:00