Hugh Nimmo-Smith 6399032312 Fix bad merge		2022-10-13 22:23:26 +01:00
..
androidTest	Merge pull request #7290 from vector-im/feature/bca/hinder_verification	2022-10-05 14:34:34 +02:00
debug/java/org/matrix/android/sdk/internal/network/interceptors	Only one FormatterJsonHttpLogger implementation is required.	2022-08-24 10:11:24 +02:00
main	Fix bad merge	2022-10-13 22:23:26 +01:00
release/java/org/matrix/android/sdk/internal/network/interceptors	Only one FormatterJsonHttpLogger implementation is required.	2022-08-24 10:11:24 +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	Adds Push Notification toggle to Device Manager (#7261)	2022-10-10 19:21:34 -04:00