ariskotsomitopoulos 15fe9edfbd Fix conflicts		2022-01-31 16:21:46 +02:00
..
sampledata	Implement poll in timeline ui.	2021-12-03 11:39:41 +03:00
signature
src	Fix conflicts	2022-01-31 16:21:46 +02:00
.gitignore
build.gradle	Merge branch 'develop' into feature/aris/threads	2022-01-31 15:58:12 +02:00
lint.xml	Remove temporary change on the "NewApi" lint error.	2022-01-18 09:17:51 +01:00
proguard-rules.pro	Fix Authenticated Jitsi not working in release #3841	2021-08-16 15:43:35 +02:00