SchildiChat-android/vector
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
..
sampledata textSize 15sp -> android:textAppearance="@style/VectorTextAppearanceSubtitle or Body 2021-06-14 22:10:12 +02:00
signature
src Merge tag 'v1.3.0' into sc 2021-09-29 09:55:02 +02:00
.gitignore Update .gitignore for gplay builds 2020-08-09 17:02:51 +02:00
build.gradle Merge tag 'v1.3.0' into sc 2021-09-29 09:55:02 +02:00
lint.xml Fix annoying issue detected by lint (CheckResult) and consider that's errors from now 2021-09-10 18:14:39 +02:00
proguard-rules.pro Fix Authenticated Jitsi not working in release #3841 2021-08-16 15:43:35 +02:00