Benoit Marty 608e01abf1 Merge branch 'develop' into feature/bma/nick_color_final		2022-01-05 16:33:13 +01:00
..
sampledata	Implement poll in timeline ui.	2021-12-03 11:39:41 +03:00
signature
src	Merge branch 'develop' into feature/bma/nick_color_final	2022-01-05 16:33:13 +01:00
.gitignore
build.gradle	Manual upgrade of the emoji2 lib	2022-01-05 13:50:16 +01:00
lint.xml	Fix lint issue (TypographyDashes)	2022-01-04 12:47:46 +01:00
proguard-rules.pro	Fix Authenticated Jitsi not working in release #3841	2021-08-16 15:43:35 +02:00