SBiOSoftWhare 6858bd85a5 Merge branch 'develop' into riot_3293 ... # Conflicts: # CHANGES.rst # Riot/Generated/Strings.swift		2020-06-26 14:30:21 +02: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	Key verification: Present a notification when receiving incoming key verification request in background.	2020-01-17 10:54:18 +01:00
Vector.strings	Merge branch 'develop' into riot_3293	2020-06-26 14:30:21 +02:00