ericdecanini 4cf97d48c9 Merge remote-tracking branch 'origin/develop' into bugfix/eric/softlogout-ux-broken ...

# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
#	vector/src/main/java/im/vector/app/features/login/LoginActivity.kt
#	vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt

2022-06-29 15:53:22 +02:00

..

sampledata

Add required resources.

2022-05-27 15:25:59 +03:00

signature

…

src

Merge remote-tracking branch 'origin/develop' into bugfix/eric/softlogout-ux-broken

2022-06-29 15:53:22 +02:00

.gitignore

…

build.gradle

Bump soloader from 0.10.3 to 0.10.4

2022-06-29 08:33:21 +00:00

lint.xml

Small improvement on lint.xml file

2022-05-16 12:23:10 +02:00

proguard-rules.pro

…