ismailgulek ed9750e53f Merge branch 'develop' into xcode11 ... # Conflicts: # CHANGES.rst # Riot.xcodeproj/project.pbxproj		2020-06-26 17:33:09 +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 branch 'develop' into riot_3293	2020-06-26 14:30:21 +02:00