element-ios/Riot/Assets/en.lproj
ismailgulek 387cfb7787
Merge branch 'develop' into xcode11
# Conflicts:
#	CHANGES.rst
#	Gemfile.lock
#	Riot.xcodeproj/project.pbxproj
#	Riot/SupportingFiles/Info.plist
#	RiotShareExtension/SupportingFiles/Info.plist
#	SiriIntents/Info.plist
2020-07-01 09:59:29 +03:00
..
InfoPlist.strings Privacy: Make NSContactsUsageDescription more generic and mention that 3pids are now uploaded hashed. 2019-09-11 17:59:45 +02:00
Localizable.strings Add loc keys 2020-06-18 14:40:24 +03:00
Vector.strings Merge pull request #3375 from vector-im/copy_update 2020-06-30 21:50:52 +02:00