ericdecanini 82cde166db Merge remote-tracking branch 'origin/develop' into feature/eric/audio-files-player ... # Conflicts: # vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageHelper.kt # vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.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/item/MessageVoiceItem.kt		2022-03-24 20:32:28 +01:00
..
.gitignore	Rename towncrier folder from newsfragment to changelog.d	2021-06-18 21:33:50 +02:00
5426.feature	Changelog added.	2022-03-04 17:21:00 +03:00
5517.misc	adding changelog entry	2022-03-23 17:29:06 +00:00
5586.feature	Adds changelog file	2022-03-21 20:04:08 +01:00