Benoit Marty 80c210e62d Merge pull request #7292 from vector-im/feature/mna/device-manager-type-icons ... [Device Management] Show correct device type icons (PSG-775)		2022-10-05 17:30:42 +02: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	Merge pull request #7292 from vector-im/feature/mna/device-manager-type-icons	2022-10-05 17:30:42 +02: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	…
test/java/org/matrix/android/sdk	Adding unit tests for mapper	2022-10-05 10:14:05 +02:00