Skip to content

Commit

Permalink
Merge branch 'release/2.2.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
Borja Santos-Diez committed Feb 21, 2017
2 parents af74ce1 + be0ede8 commit 243806e
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Cartfile
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "mobgen/halo-ios" "2.2.0"
github "facebook/facebook-sdk-swift"
github "mobgen/halo-ios" "2.2.1"
github "facebook/facebook-sdk-swift"
2 changes: 1 addition & 1 deletion Cartfile.resolved
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ github "BoltsFramework/Bolts-ObjC" "1.8.4"
github "Quick/Nimble" "v5.1.1"
github "AliSoftware/OHHTTPStubs" "5.2.3-swift3"
github "Quick/Quick" "v1.0.0"
github "mobgen/halo-ios" "2.2.0"
github "mobgen/halo-ios" "2.2.1"
github "facebook/facebook-ios-sdk" "sdk-version-4.19.0"
github "facebook/facebook-sdk-swift" "0.2.0"
2 changes: 1 addition & 1 deletion Facebook/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.2.0</string>
<string>2.2.1</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
Expand Down
2 changes: 1 addition & 1 deletion Google/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.2.0</string>
<string>2.2.1</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
Expand Down

0 comments on commit 243806e

Please sign in to comment.