diff options
| author | Michael <michael.foiani@gmail.com> | 2021-07-02 14:45:18 -0400 |
|---|---|---|
| committer | Michael <michael.foiani@gmail.com> | 2021-07-02 14:45:18 -0400 |
| commit | 0d95e094b6370f32f6214d74a87ca56ea6eb477e (patch) | |
| tree | 9cb100002b07a2ccd2aecbdf727d1ddb33ca0df7 /ios/Frontend | |
| parent | 643e7adcda3e5ae7aa3daeb86020f2e6f38d1448 (diff) | |
| parent | fa9c527f85d23a38b45c7efc41ec4590597fa7a1 (diff) | |
Merge master into this test branch.
Diffstat (limited to 'ios/Frontend')
| -rw-r--r-- | ios/Frontend/Info.plist | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/ios/Frontend/Info.plist b/ios/Frontend/Info.plist index d74f2dcb..b04df4b4 100644 --- a/ios/Frontend/Info.plist +++ b/ios/Frontend/Info.plist @@ -56,12 +56,15 @@ <string></string> <key>NSMainNibFile</key> <string>LaunchScreen</string> +<<<<<<< HEAD <key>NSMicrophoneUsageDescription</key> <string>Enable microphone access to record and listen to videos</string> <key>NSPhotoLibraryAddUsageDescription</key> <string>This lets you save photos captured on Tagg, to your library</string> <key>NSPhotoLibraryUsageDescription</key> <string>This lets you share photos from your library and select profile displays</string> +======= +>>>>>>> master <key>UIAppFonts</key> <array> <string>Feather.ttf</string> @@ -72,6 +75,8 @@ </array> <key>UILaunchStoryboardName</key> <string>LaunchScreen</string> + <key>NSMicrophoneUsageDescription</key> + <string>This lets you share video audio from your camera for a Moment post on your profile!</string> <key>UIRequiredDeviceCapabilities</key> <array> <string>armv7</string> @@ -80,6 +85,12 @@ <array> <string>UIInterfaceOrientationPortrait</string> </array> + <key>NSPhotoLibraryUsageDescription</key> + <string>This lets you share photos from your library and select profile displays</string> + <key>NSPhotoLibraryAddUsageDescription</key> + <string>This lets you save photos captured on Tagg, to your library</string> + <key>NSCameraUsageDescription</key> + <string>This lets you share photos/videos from your camera for a Moment post on your profile!</string> <key>UIViewControllerBasedStatusBarAppearance</key> <false/> </dict> |