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
..
sampledata	…
signature	Setup `nightly` buildType	2022-07-05 16:07:12 +02:00
src	Merge tag 'v1.4.34' into sc	2022-08-24 10:14:36 +02:00
.gitignore	…
build.gradle	Merge tag 'v1.4.34' into sc	2022-08-24 10:14:36 +02:00
lint.xml	Ignore PluralsCandidate, I do not know why it is reported by Danger, since this is a warning. Also make this issue an error.	2022-07-29 10:02:40 +02:00
proguard-rules.pro	…