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
..
array.xml	Fix typo in resource name	2021-03-03 11:18:50 +01:00
donottranslate.xml	adding personalization complete screen	2022-03-15 13:07:22 +00:00
font_certs.xml	Ignore lint issues false positive	2021-05-17 10:25:31 +02:00
ids.xml	XML standart	2021-04-28 11:15:58 +02:00
strings.xml	Merge remote-tracking branch 'origin/develop' into feature/eric/audio-files-player	2022-03-24 20:32:28 +01:00
strings_login_v2.xml	Remove unused resources	2022-03-09 14:55:40 +01:00
strings_no_weblate.xml	applying english override for the last carousel page copy	2022-01-17 09:24:53 +00:00