update project

xudafeng · xudafeng · commit 95e38643c34a · 2016-10-17T11:00:02.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -24,5 +24,6 @@ DerivedData
 # http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
 #
 # Pods/
-*.swp
-*.swo
+*.sw*
+*.un~
+.DS_Store
diff --git a/README.md b/README.md
@@ -1,4 +1,3 @@
-feedit-ios
-==========
+# feedit_ios
 
 feedit ios
diff --git a/assets/README.md b/assets/README.md
@@ -1,2 +1 @@
-webview
-=======
+# webview
diff --git a/feedit_ios/Images.xcassets/AppIcon.appiconset/Contents.json b/feedit_ios/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -1,5 +1,15 @@
 {
   "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
     {
       "size" : "29x29",
       "idiom" : "iphone",
diff --git a/feedit_ios/Info.plist b/feedit_ios/Info.plist
@@ -38,5 +38,10 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 </dict>
 </plist>

Original file line number	Diff line number	Diff line change
`@@ -24,5 +24,6 @@ DerivedData`
`24`	`24`	`# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control`
`25`	`25`	`#`
`26`	`26`	`# Pods/`
`27`		`-*.swp`
`28`		`-*.swo`
	`27`	`+.sw`
	`28`	`+*.un~`
	`29`	`+.DS_Store`