Jelajahi Sumber

Merge branch 'master' into feature/ios10

Ashley Mills 9 tahun lalu
induk
melakukan
caf4a17224
1 mengubah file dengan 4 tambahan dan 1 penghapusan
  1. 4 1
      .gitignore

+ 4 - 1
.gitignore

@@ -23,4 +23,7 @@ DerivedData
 # http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
 #
 # Pods/
-.DS_Store
+.DS_Store
+
+# Carthage
+Carthage/Build