Benoit Marty 4ae09b8716 Merge pull request #831 from david1hyman/file-decryption-fix ... File decryption path was writing incorrect stream to file		2020-01-16 10:50:15 +01:00
..
androidTest/java/im/vector/matrix/android	Merge branch 'develop' into feature/room_profile	2020-01-14 18:35:01 +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 pull request #831 from david1hyman/file-decryption-fix	2020-01-16 10:50:15 +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	Fix ktlint issues	2020-01-09 14:20:17 +01:00