SchildiChat-android/vector
SpiritCroc 58f5310e83 Merge tag 'v1.2.0' into sc
v1.2.0

Change-Id: I900672607ec264e60c96c886d0accb053934fa4a

Conflicts:
	vector/src/main/res/xml/vector_settings_labs.xml
2021-08-12 09:03:42 +02:00
..
sampledata textSize 15sp -> android:textAppearance="@style/VectorTextAppearanceSubtitle or Body 2021-06-14 22:10:12 +02:00
signature
src Merge tag 'v1.2.0' into sc 2021-08-12 09:03:42 +02:00
.gitignore
build.gradle Merge tag 'v1.2.0' into sc 2021-08-12 09:03:42 +02:00
lint.xml Remove useless parent 2021-06-11 10:22:18 +02:00
proguard-rules.pro