Merge remote-tracking branch 'matzew/master' (pull request #418)

77e8071b · Justin Spahr-Summers · 88951d5c · 0acbcf4b · 77e8071b
Commit 77e8071b authored Jul 02, 2013 by Justin Spahr-Summers
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

Objective-C.gitignore Objective-C.gitignore +4 -0

No files found.
--- a/Objective-C.gitignore
+++ b/Objective-C.gitignore
@@ -15,3 +15,7 @@ profile
 DerivedData
 .idea/
 *.hmap
+
+#CocoaPods
+Podfile.lock
+Pods