mirror of
https://bitbucket.org/vendoo/vendoo_v1.0.git
synced 2025-12-25 19:57:41 +00:00
5dfd6adba6
Conflicts: .DS_Store Podfile.lock Pods/Manifest.lock Pods/Pods.xcodeproj/project.pbxproj Pods/Pods.xcodeproj/xcuserdata/okechi.xcuserdatad/xcschemes/xcschememanagement.plist Pods/SOAPEngine/README.md Pods/SOAPEngine/SOAPEngine64.framework/Headers/SOAPEngine.h Pods/SOAPEngine/SOAPEngine64.framework/Info.plist Pods/SOAPEngine/SOAPEngine64.framework/SOAPEngine64 Pods/SOAPEngine/SOAPEngine64.framework/_CodeSignature/CodeDirectory Pods/SOAPEngine/SOAPEngine64.framework/_CodeSignature/CodeResources Pods/SOAPEngine/SOAPEngine64.framework/_CodeSignature/CodeSignature Pods/Target Support Files/AFNetworking/AFNetworking.xcconfig Pods/Target Support Files/AeroGearHttp/AeroGearHttp.xcconfig Pods/Target Support Files/AeroGearOAuth2/AeroGearOAuth2.xcconfig Pods/Target Support Files/Alamofire-SwiftyJSON/Alamofire-SwiftyJSON.xcconfig Pods/Target Support Files/Alamofire/Alamofire.xcconfig Pods/Target Support Files/BSGridCollectionViewLayout/BSGridCollectionViewLayout.xcconfig Pods/Target Support Files/BSImagePicker/BSImagePicker.xcconfig Pods/Target Support Files/Bolts/Bolts.xcconfig Pods/Target Support Files/FBSDKCoreKit/FBSDKCoreKit.xcconfig Pods/Target Support Files/FBSDKLoginKit/FBSDKLoginKit.xcconfig Pods/Target Support Files/FBSDKShareKit/FBSDKShareKit.xcconfig Pods/Target Support Files/GDataXML-HTML/GDataXML-HTML.xcconfig Pods/Target Support Files/Locksmith/Locksmith.xcconfig Pods/Target Support Files/OAuthSwift/OAuthSwift.xcconfig Pods/Target Support Files/PicoKit/PicoKit.xcconfig Pods/Target Support Files/Pods-Vendoo/Pods-Vendoo.debug.xcconfig Pods/Target Support Files/Pods-Vendoo/Pods-Vendoo.release.xcconfig Pods/Target Support Files/Pods-VendooTests/Pods-VendooTests.debug.xcconfig Pods/Target Support Files/Pods-VendooTests/Pods-VendooTests.release.xcconfig Pods/Target Support Files/Pods-VendooUITests/Pods-VendooUITests.debug.xcconfig Pods/Target Support Files/Pods-VendooUITests/Pods-VendooUITests.release.xcconfig Pods/Target Support Files/SWRevealViewController/SWRevealViewController.xcconfig Pods/Target Support Files/SwiftyJSON/SwiftyJSON.xcconfig Pods/Target Support Files/TYMActivityIndicatorView/TYMActivityIndicatorView.xcconfig Pods/Target Support Files/UIImageViewModeScaleAspect/UIImageViewModeScaleAspect.xcconfig Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist Vendoo/EtsyRESTAPIManager.swift Vendoo/ListingPreviewViewController.swift