ericdecanini 7449d15d2f 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-22 14:15:29 +01:00
..
android/sdk	Merge remote-tracking branch 'origin/develop' into bugfix/eric/voting-ended-poll	2022-03-22 14:15:29 +01:00
androidsdk/crypto/data	Standardise spelling and casing of homeserver	2021-07-15 15:58:50 +01:00