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
..
attachment-viewer	Merge tag 'v1.4.27-RC2' into merge-v1.4.27	2022-07-09 18:16:33 +02:00
core-utils	Merge tag 'v1.4.18' into sc	2022-06-01 13:54:34 +02:00
diff-match-patch	Global import optimization	2022-04-12 16:06:27 +02:00
jsonviewer	removing no longer needed butterknife dependency	2022-06-29 17:22:57 +01:00
multipicker	Merge tag 'v1.4.28' into merge-v1.4.28	2022-07-17 18:52:55 +02:00
ui-styles	Merge tag 'v1.4.34' into sc	2022-08-24 10:14:36 +02:00