ganfra 880da9ecd5 Merge branch 'develop' into feature/fga/dial_pad_tab ... # Conflicts: # vector/src/main/java/im/vector/app/features/call/dialpad/DialPadFragment.kt # vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt		2021-06-10 15:37:24 +02:00
..
androidTest/java/org/matrix/android/sdk	Account data: allow querying room account data globally from session)	2021-06-09 18:44:30 +02:00
debug/java/org/matrix/android/sdk/internal/network/interceptors	Move interface to correct location	2021-01-07 18:28:05 +01:00
main	Merge branch 'develop' into feature/fga/dial_pad_tab	2021-06-10 15:37:24 +02:00
release/java/org/matrix/android/sdk/internal/network/interceptors	Fix Copyright mention in SDK code	2020-10-08 15:04:55 +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	Use Junit import	2021-05-04 10:50:31 +02:00