Merge branch 'master' into develop

Superbil · Superbil · commit 76525e18d352 · 2017-11-29T18:57:54.000+08:00
diff --git a/hackfoldr-iOS/Images.xcassets/AppIcon.appiconset/Contents.json b/hackfoldr-iOS/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -99,8 +99,9 @@
       "scale" : "2x"
     },
     {
-      "idiom" : "ios-marketing",
       "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "iTunesArtwork@2x.png",
       "scale" : "1x"
     },
     {
diff --git a/hackfoldr-iOS/Images.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png b/hackfoldr-iOS/Images.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png
diff --git a/hackfoldr-iOS/hackfoldr-iOS-Info.plist b/hackfoldr-iOS/hackfoldr-iOS-Info.plist
@@ -55,6 +55,8 @@
 	<true/>
 	<key>NSCameraUsageDescription</key>
 	<string>Scan QR code</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>Access photo library</string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>

Original file line number	Diff line number	Diff line change
`@@ -99,8 +99,9 @@`
`99`	`99`	`"scale" : "2x"`
`100`	`100`	`},`
`101`	`101`	`{`
`102`		`- "idiom" : "ios-marketing",`
`103`	`102`	`"size" : "1024x1024",`
	`103`	`+ "idiom" : "ios-marketing",`
	`104`	`+ "filename" : "iTunesArtwork@2x.png",`
`104`	`105`	`"scale" : "1x"`
`105`	`106`	`},`
`106`	`107`	`{`