ariskotsomitopoulos 6e06aed627 Merge branch 'develop' into feature/aris/threads_ui_enhancements ... # Conflicts: # vector/src/main/res/menu/menu_timeline.xml		2022-04-05 16:32:49 +03:00
..
sampledata	Implement poll in timeline ui.	2021-12-03 11:39:41 +03:00
signature
src	Merge branch 'develop' into feature/aris/threads_ui_enhancements	2022-04-05 16:32:49 +03:00
.gitignore
build.gradle	Bump libphonenumber from 8.12.45 to 8.12.46	2022-03-31 23:08:28 +00:00
lint.xml	Remove unused resources	2022-03-09 14:55:40 +01:00
proguard-rules.pro	Fix Authenticated Jitsi not working in release #3841	2021-08-16 15:43:35 +02:00