Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Added a second json file for testing #20

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into userJSON
wanewang committed Nov 8, 2016
commit aaabe30a56ab91ff234584f2f9b89fcbf2c7034c
1 change: 1 addition & 0 deletions Cartfile
Original file line number Diff line number Diff line change
@@ -7,3 +7,4 @@ github "Hearst-DD/ObjectMapper" ~> 2.2
github "vdka/json" ~> 0.16
github "hkellaway/Gloss" "master"
github "LoganWright/Genome" == 3.0.3
github "postmates/PMJSON" "master"
11 changes: 6 additions & 5 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
github "Anviking/Decodable" "5cbd5cf2a13376e11f8c8808c437c7e8f9e45e27"
github "Anviking/Decodable" "0a59e61d2522dc2f42f3b9f636dcce3869651c92"
github "LoganWright/Genome" "3.0.3"
github "hkellaway/Gloss" "731d09219477c1765505473af6d5152dc968d778"
github "utahiosmac/Marshal" "ba0c55e5edfc216aae486229f6f5456ce3db4473"
github "Hearst-DD/ObjectMapper" "2.2.0"
github "SwiftyJSON/SwiftyJSON" "ffbc7e4b8ee0e9ec76966007e7a7bef659aea284"
github "JohnSundell/Unbox" "0be5e80a43b247a10d4a2f08150b847c7e784967"
github "vdka/json" "0.16.1"
github "Hearst-DD/ObjectMapper" "2.2.1"
github "postmates/PMJSON" "2857cd48632974c0e3b79f9c05d3a07cfd6f637b"
github "SwiftyJSON/SwiftyJSON" "1dc2ce0f913b27380cd5b803af8aa853745b9608"
github "JohnSundell/Unbox" "ac69e55c85a7d7e155b06c001bcbea26c19f3375"
github "vdka/json" "0.16.2"
github "lyft/mapper" "8f5b51bee8627eaa162eb42953ef0a6521880041"
You are viewing a condensed version of this merge commit. You can view the full changes here.