SchildiChat-android/vector
SpiritCroc 6aa6f3e01b Merge tag 'v1.1.3' into sc
Change-Id: I50f78eeec11fc4d606ddabb68d08a5ff97bbad13

Conflicts:
	vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
2021-04-09 11:57:11 +02:00
..
sampledata
signature
src Merge tag 'v1.1.3' into sc 2021-04-09 11:57:11 +02:00
.gitignore
build.gradle Merge tag 'v1.1.3' into sc 2021-04-09 11:57:11 +02:00
lint.xml Fix issue with Locale folder. 2021-03-10 21:54:11 +01:00
proguard-rules.pro