Benoit Marty 7890e83204 Merge pull request #630 from vector-im/feature/crypto_lock ... Fix dead lock on crypto		2019-10-22 16:53:33 +02:00
..
androidTest/java/im/vector/matrix/android	Fix ktlint issue automatically by running ./ktlint --android -v -F	2019-10-09 15:24:05 +02: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 pull request #630 from vector-im/feature/crypto_lock	2019-10-22 16:53:33 +02:00
release/java/im/vector/matrix/android/internal/network/interceptors
test/java/im/vector/matrix/android/api/pushrules	Merge pull request #626 from vector-im/feature/myUserIdInject	2019-10-21 16:01:48 +02:00