ericdecanini 6df88fba59 Merge remote-tracking branch 'origin/develop' into task/eric/when-arrow-alignment ... # Conflicts: # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/GroupSyncHandler.kt # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt # vector/src/main/java/im/vector/app/features/home/HomeActivity.kt # vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt # vector/src/main/java/im/vector/app/features/home/InitSyncStepFormatter.kt # vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt # vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt # vector/src/main/java/im/vector/app/features/sync/widget/SyncStateView.kt		2022-06-08 12:59:54 +02:00
..
.gitignore	Rename towncrier folder from newsfragment to changelog.d	2021-06-18 21:33:50 +02:00
5285.wip	adding changelog entry	2022-06-01 09:11:05 +01:00
5528.bugfix	Fix modifying the wrong events in TimelineChunk	2022-03-13 08:19:47 +01:00
5970.feature	Add changelog entry	2022-05-31 17:49:47 +02:00
6017.misc	adding changelog entry	2022-06-01 10:41:37 +01:00
6029.sdk	Add changelog	2022-06-08 09:55:28 +02:00
6093.sdk	adding changelog entry	2022-06-01 16:48:10 +01:00
6126.misc	Adds changelog file	2022-06-08 09:34:29 +02:00
6146.feature	Add support for setting pre sharing keys mode from .well-known	2022-05-31 11:32:39 +02:00
6169.sdk	allow passing the new password when resetting passwords either upfront or as part of the confirmation step	2022-06-06 13:57:59 +01:00
6209.bugfix	Adding changelog entry	2022-05-31 15:56:16 +02:00
6222.bugfix	Changelog added.	2022-06-01 17:02:17 +03:00
6232.bugfix	fix text cropped	2022-06-03 14:41:43 +02:00
6244.feature	Changelog added.	2022-06-07 01:05:10 +03:00