ericdecanini edfe81cc2b Merge remote-tracking branch 'origin/develop' into bugfix/eric/voting-ended-poll ... # Conflicts: # vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt		2022-03-24 14:40:28 +01:00
..
assets	Try to communicate with WidgetPostAPI	2020-05-13 20:04:08 +02:00
java/org	Merge remote-tracking branch 'origin/develop' into bugfix/eric/voting-ended-poll	2022-03-24 14:40:28 +01:00
res	Import sas strings	2021-06-18 10:25:37 +02:00
AndroidManifest.xml	Fix warning	2021-09-02 09:43:39 +02:00