Skip to content
This repository has been archived by the owner on Mar 10, 2022. It is now read-only.

Commit

Permalink
Merge pull request #118 from nodes-ios/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
@chriscombs
chriscombs authored Nov 29, 2016
2 parents 1cb1ee7 + 6475d5d commit 5844b36
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Cartfile.resolved
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "Alamofire/Alamofire" "4.1.0"
github "nodes-ios/Cashier" "1.1.1"
github "Alamofire/Alamofire" "4.2.0"
github "nodes-ios/Cashier" "1.2.1"
4 changes: 2 additions & 2 deletions Serpent/Serpent.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1120,7 +1120,7 @@
FRAMEWORK_SEARCH_PATHS = "\"$(PROJECT_DIR)/../Carthage/Build/iOS\"";
INFOPLIST_FILE = "$(SRCROOT)/Serpent/Supporting Files/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.nodes.Serpent;
PRODUCT_NAME = Serpent;
Expand All @@ -1143,7 +1143,7 @@
FRAMEWORK_SEARCH_PATHS = "\"$(PROJECT_DIR)/../Carthage/Build/iOS\"";
INFOPLIST_FILE = "$(SRCROOT)/Serpent/Supporting Files/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.nodes.Serpent;
PRODUCT_NAME = Serpent;
Expand Down

0 comments on commit 5844b36

Please sign in to comment.