SpiritCroc 9ba32bc5bb Rework SC theme and more fix merge conflicts to make it compile again ...

Note: SC colors still need work, this is just to make the semi-merge compile.

Change-Id: Iaf144e1ce6f349d10759ba1c22c3dc404dee4768

2021-06-23 12:38:27 +02:00

..

sampledata

Split sample step 3: rooms and spaces

2021-05-10 23:07:08 +02:00

signature

…

src

Rework SC theme and more fix merge conflicts to make it compile again

2021-06-23 12:38:27 +02:00

.gitignore

Update .gitignore for gplay builds

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

build.gradle

Merge commit '8b138e8ff' into sc

2021-06-20 09:18:03 +02:00

lint.xml

Ignore lint false positive

2021-05-18 21:23:50 +02:00

proguard-rules.pro

Initial commit jitsi

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