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
..
java/im/vector/lib/ui/styles/dialogs	Move this class to the correct folder	2022-01-13 20:32:59 +01:00
res	Merge branch 'develop' into feature/aris/threads_ui_enhancements	2022-04-05 16:32:49 +03:00
AndroidManifest.xml	Fix lint issues	2021-09-02 10:36:29 +02:00