Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
Arnaud Vergnet 2020-06-22 16:11:51 +02:00
commit d9ae6ad3a5
2 changed files with 5 additions and 5 deletions

View file

@ -323,12 +323,12 @@
CODE_SIGN_ENTITLEMENTS = Campus/application.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4;
CURRENT_PROJECT_VERSION = 2;
DEAD_CODE_STRIPPING = NO;
DEVELOPMENT_TEAM = 6JA7CLNUV6;
INFOPLIST_FILE = Campus/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 3.0.5;
MARKETING_VERSION = 3.0.7;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
@ -349,11 +349,11 @@
CODE_SIGN_ENTITLEMENTS = Campus/application.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = 6JA7CLNUV6;
INFOPLIST_FILE = Campus/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 3.0.5;
MARKETING_VERSION = 3.0.7;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",

View file

@ -53,7 +53,7 @@
</dict>
</dict>
<key>NSCameraUsageDescription</key>
<string>Allow Campus to use the camera</string>
<string>Allow Campus to use the camera to scan QRCodes</string>
<key>UIAppFonts</key>
<array>
<string>MaterialCommunityIcons.ttf</string>