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
..
androidTest	Fix parent relation handling	2021-09-16 09:33:06 +02:00
debug/java/org/matrix/android/sdk/internal/network/interceptors	Move interface to correct location	2021-01-07 18:28:05 +01:00
main	Merge tag 'v1.3.0' into sc	2021-09-29 09:55:02 +02:00
release/java/org/matrix/android/sdk/internal/network/interceptors	Fix Copyright mention in SDK code	2020-10-08 15:04:55 +02:00
sharedTest/java/org/matrix/android/sdk/test/shared	Fix Copyright mention in SDK code	2020-10-08 15:04:55 +02:00
test/java/org/matrix/android/sdk	Ignore warning in test.	2021-09-03 17:02:14 +02:00