ericdecanini ce579c1dd3 Merge remote-tracking branch 'origin/develop' into bugfix/eric/softlogout-ux-broken ... # Conflicts: # vector/src/main/java/im/vector/app/features/login/LoginActivity.kt # vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt		2022-03-28 15:59:50 +02:00
..
.gitignore	Rename towncrier folder from newsfragment to changelog.d	2021-06-18 21:33:50 +02:00
5398.bugfix	Adds changelog file	2022-03-07 10:53:43 +01:00
5426.feature	Changelog added.	2022-03-04 17:21:00 +03:00
5473.bugfix	Reverts to fix by removing event timestamp condition	2022-03-10 19:16:22 +01:00
5497.bugfix	[Subscribing] Blank display name	2022-03-28 10:34:22 +02:00
5517.misc	adding changelog entry	2022-03-23 17:29:06 +00:00
5595.feature	Trigger github actions.	2022-03-28 12:11:22 +03:00