Merge branch 'release/2.0'

# Conflicts: # JSONCodable.podspec
matthewcheok · Oct 18, 2015 · 4460000 · 4460000
2 parents f55fb0a + d323960
commit 4460000
Show file tree

Hide file tree

Showing 32 changed files with 990 additions and 1,380 deletions.
diff --git a/Demo/Demo.xcodeproj/project.pbxproj b/Demo/Demo.xcodeproj/project.pbxproj
diff --git a/Demo/Demo.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Demo/Demo.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/Demo/Demo/AppDelegate.swift b/Demo/Demo/AppDelegate.swift
diff --git a/Demo/Demo/Assets.xcassets/AppIcon.appiconset/Contents.json b/Demo/Demo/Assets.xcassets/AppIcon.appiconset/Contents.json
diff --git a/Demo/Demo/Base.lproj/LaunchScreen.storyboard b/Demo/Demo/Base.lproj/LaunchScreen.storyboard
diff --git a/Demo/Demo/Base.lproj/Main.storyboard b/Demo/Demo/Base.lproj/Main.storyboard
diff --git a/Demo/Demo/Company.swift b/Demo/Demo/Company.swift
diff --git a/Demo/Demo/Info.plist b/Demo/Demo/Info.plist
diff --git a/Demo/Demo/User.swift b/Demo/Demo/User.swift
diff --git a/Demo/Demo/ViewController.swift b/Demo/Demo/ViewController.swift
diff --git a/Demo/DemoTests/DemoTests.swift b/Demo/DemoTests/DemoTests.swift