SpiritCroc c5f59b9752 Fix mismerge ...

Change-Id: Ieb568d343a568a2b29297fe9824430ab5e8a4a94

2020-10-17 16:20:01 +02:00

..

sampledata

…

signature

…

src

Fix mismerge

2020-10-17 16:20:01 +02:00

.gitignore

Update .gitignore for gplay builds

2020-08-09 17:02:51 +02:00

build.gradle

Merge remote-tracking branch 'upstream/master' into sc

2020-10-17 15:28:18 +02:00

lint.xml

Lint: fixes UseCompatTextViewDrawableXml issues

2020-10-08 09:35:24 +02:00

proguard-rules.pro

Initial commit jitsi

2020-08-14 09:31:24 +02:00