SpiritCroc c20a6b8001 Fix mismerge ... Change-Id: I78b7e835c6ce477074aaf3220aef4193a51f3717		2020-09-08 19:26:49 +02:00
..
sampledata	Room profile: make link in room topic clickable	2020-01-16 16:36:56 +01:00
signature
src	Fix mismerge	2020-09-08 19:26:49 +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-09-08 18:52:59 +02:00
lint.xml	Set severity of ObsoleteSdkInt to error	2020-08-18 00:46:37 +02:00
proguard-rules.pro	Initial commit jitsi	2020-08-14 09:31:24 +02:00