filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
SchildiChat-android/vector
History
SpiritCroc 38ae03893f Merge tag 'v1.3.1' into sc 
Change-Id: I1e5589c78e3398867519b1dbd326581cbe60baea

Conflicts:
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt
	vector/src/main/res/drawable/ic_jump_to_unread.xml
	vector/src/main/res/drawable/ic_radio_on.xml
	vector/src/main/res/drawable/ic_voice_message_locked.xml
	vector/src/main/res/drawable/ic_voice_mic_recording.xml
 		2021-09-30 09:27:15 +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.1' into sc 2021-09-30 09:27:15 +02:00
.gitignore
…
build.gradle Merge tag 'v1.3.1' into sc 2021-09-30 09:27:15 +02: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