ericdecanini 31a3552e26 Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-labs ... # Conflicts: # vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt		2022-09-06 15:32:00 +02:00
..
src/main	Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-labs	2022-09-06 15:32:00 +02:00
build.gradle	moving all the strings to a dedicated libray/strings module	2022-09-01 14:58:07 +01:00