SchildiChat-android/vector
SpiritCroc c5f48fa4d2 Merge tag 'v1.3.7' into sc
Change-Id: Id73c834c10e11ccd46d7d2adc8328eb95d051941

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt
	vector/build.gradle
	vector/src/fdroid/AndroidManifest.xml
	vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt
	vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/main/java/im/vector/app/VectorApplication.kt
	vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
	vector/src/main/java/im/vector/app/core/receiver/OnApplicationUpgradeOrRebootReceiver.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
2021-11-17 19:01:22 +01:00
..
sampledata textSize 15sp -> android:textAppearance="@style/VectorTextAppearanceSubtitle or Body 2021-06-14 22:10:12 +02:00
signature
src Merge tag 'v1.3.7' into sc 2021-11-17 19:01:22 +01:00
.gitignore Update .gitignore for gplay builds 2020-08-09 17:02:51 +02:00
build.gradle Merge tag 'v1.3.7' into sc 2021-11-17 19:01:22 +01:00
lint.xml SpUsage lint rule is more about a11y 2021-09-14 15:57:24 +02:00
proguard-rules.pro Fix Authenticated Jitsi not working in release #3841 2021-08-16 15:43:35 +02:00