ericdecanini ce579c1dd3 Merge remote-tracking branch 'origin/develop' into bugfix/eric/softlogout-ux-broken ... # Conflicts: # vector/src/main/java/im/vector/app/features/login/LoginActivity.kt # vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt		2022-03-28 15:59:50 +02:00
..
sampledata
signature
src	Merge remote-tracking branch 'origin/develop' into bugfix/eric/softlogout-ux-broken	2022-03-28 15:59:50 +02:00
.gitignore
build.gradle	updating version to 1.4.8	2022-03-28 09:46:26 +01:00
lint.xml	Remove unused resources	2022-03-09 14:55:40 +01:00
proguard-rules.pro