ericdecanini 64e074840b Merge remote-tracking branch 'origin/develop' into feature/eric/registration-feature-flag ... # Conflicts: # vector/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt # vector/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt # vector/src/main/java/im/vector/app/features/VectorFeatures.kt		2022-02-23 17:31:43 +01:00
..
.gitignore	Rename towncrier folder from newsfragment to changelog.d	2021-06-18 21:33:50 +02:00
5158.wip	adding changelog entry	2022-02-07 09:22:36 +00:00
5303.misc	Bubbles: clean and add changelog	2022-02-22 18:05:47 +01:00
5309.misc	adds changelog file	2022-02-22 20:03:00 +01:00
5312.misc	Newsfile	2022-02-23 11:24:47 +00:00
5313.misc	#5313: Update reaction button layout.	2022-02-23 11:26:21 +01:00
5318.misc	Newsfile	2022-02-23 11:24:47 +00:00
5325.feature	adds changelog file	2022-02-23 17:26:50 +01:00