SchildiChat-android/vector/src/main
SpiritCroc c20a6b8001 Fix mismerge
Change-Id: I78b7e835c6ce477074aaf3220aef4193a51f3717
2020-09-08 19:26:49 +02:00
..
assets Support for image compression on Android 10 2020-09-04 09:36:18 +02:00
java/im/vector/app Fix mismerge 2020-09-08 19:26:49 +02:00
res Revert "Revert "Resolve required manual intervention in german strings"" 2020-09-08 19:17:23 +02:00
AndroidManifest.xml Merge remote-tracking branch 'upstream/master' into sc 2020-09-08 18:52:59 +02:00