Merge branch 'multi-device' into dev

6 years ago · 61fccf2249
parent a19b78a57d bd2d707fa8
commit 61fccf2249
2 changed files with 2 additions and 2 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 3c04932e22fc5d52615b1e7d1b2e4572d72cd586
+Subproject commit 19813272b09a3ee9750b251799a11c4fb4500c97
--- a/Signal/Signal-Info.plist
+++ b/Signal/Signal-Info.plist
@ -127,7 +127,7 @@
 	<key>NSContactsUsageDescription</key>
 	<string>Signal uses your contacts to find users you know. We do not store your contacts on the server.</string>
 	<key>NSFaceIDUsageDescription</key>
-	<string>Signal's Screen Lock uses Face ID.</string>
+	<string>Loki Messenger&apos;s Screen Lock feature uses Face ID.</string>
 	<key>NSMicrophoneUsageDescription</key>
 	<string>Signal needs access to your microphone to make and receive phone calls and record voice messages.</string>
 	<key>NSPhotoLibraryAddUsageDescription</key>