Merge remote-tracking branch 'upstream/master' into swift_3.0 # Conflicts: # UsergridSDK.xcodeproj/project.pbxproj
Project: http://git-wip-us.apache.org/repos/asf/usergrid-swift/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid-swift/commit/a69b3869 Tree: http://git-wip-us.apache.org/repos/asf/usergrid-swift/tree/a69b3869 Diff: http://git-wip-us.apache.org/repos/asf/usergrid-swift/diff/a69b3869 Branch: refs/heads/master Commit: a69b38691cf47caf161374353c2400f7c7094e72 Parents: 5bed16c 0dc6470 Author: Robert Walsh <[email protected]> Authored: Fri Sep 16 12:29:24 2016 -0500 Committer: Robert Walsh <[email protected]> Committed: Fri Sep 16 12:29:24 2016 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
