SpiritCroc 4f93eb041c Merge tag 'v1.3.0' into sc ... Change-Id: Ib681fa5493f078b15d6110262ba622b9d0384d68 Conflicts: gradle.properties vector/build.gradle vector/src/main/java/im/vector/app/AppStateHandler.kt vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt vector/src/main/res/layout/reaction_button.xml		2021-09-29 09:55:02 +02:00
..
src/main	Do not crash on sending 0 byte videos	2021-08-20 09:15:58 +02:00
.gitignore	Initial implementation of multipicker.	2020-03-20 12:12:59 +03:00
build.gradle	Enhance dependencies handling to support Dependabot	2021-09-17 14:58:44 +03:00
consumer-rules.pro	Initial implementation of multipicker.	2020-03-20 12:12:59 +03:00
proguard-rules.pro	Initial implementation of multipicker.	2020-03-20 12:12:59 +03:00