ericdecanini 41d859dc5b Merge remote-tracking branch 'origin/develop' into feature/eric/space-list-modal ... # Conflicts: # vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt		2022-08-05 17:10:36 +02:00
..
debug	Migration to activity 1.5.0. Rework menu management	2022-07-01 17:06:02 +02:00
main	Merge remote-tracking branch 'origin/develop' into feature/eric/space-list-modal	2022-08-05 17:10:36 +02:00
release/res/values