SpiritCroc e6023c6bae Merge tag 'v1.4.34' into sc ... Change-Id: I7e1939f6c87e14d1497433a9bad4f97e074bb838 Conflicts: vector/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt vector/src/main/java/im/vector/app/features/home/HomeActivity.kt vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListAction.kt vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListFragment.kt vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt vector/src/main/res/layout/fragment_login_server_url_form_2.xml vector/src/main/res/layout/fragment_room_list.xml		2022-08-24 10:14:36 +02:00
..
debug	Migration to activity 1.5.0. Rework menu management	2022-07-01 17:06:02 +02:00
main	Merge tag 'v1.4.34' into sc	2022-08-24 10:14:36 +02:00
release/res/values	Move test style Activity and layout to the new ui-style module	2021-06-15 18:17:36 +02:00