Merge branch 'release/0.0.1'

hhanesand · May 3, 2015 · f23de22 · f23de22
2 parents 981833b + 5d63081
commit f23de22
Show file tree

Hide file tree

Showing 22 changed files with 979 additions and 453 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,9 @@
+[submodule "Carthage/Checkouts/Quick"]
+	path = Carthage/Checkouts/Quick
+	url = https://github.com/Quick/Quick.git
+[submodule "Carthage/Checkouts/Alamofire"]
+	path = Carthage/Checkouts/Alamofire
+	url = https://github.com/Alamofire/Alamofire.git
+[submodule "Carthage/Checkouts/Nimble"]
+	path = Carthage/Checkouts/Nimble
+	url = https://github.com/Quick/Nimble.git
diff --git a/AlamofireOAuth1.xcodeproj/project.pbxproj b/AlamofireOAuth1.xcodeproj/project.pbxproj
diff --git a/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata b/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata
diff --git a/...eOAuth1/AlamofireOAuth1/AlamofireOAuth1.h → AlamofireOAuth1/AlamofireOAuth1.h b/...eOAuth1/AlamofireOAuth1/AlamofireOAuth1.h → AlamofireOAuth1/AlamofireOAuth1.h
@@ -14,6 +14,4 @@ FOUNDATION_EXPORT double AlamofireOAuth1VersionNumber;
 //! Project version string for AlamofireOAuth1.
 FOUNDATION_EXPORT const unsigned char AlamofireOAuth1VersionString[];
 
-// In this header, you should import all the public headers of your framework using statements like #import <AlamofireOAuth1/PublicHeader.h>
-
-
+// In this header, you should import all the public headers of your framework using statements like #import <AlamofireOAuth1/PublicHeader.h>