Robert Payne f03dd0e85f Merge branch 'feature/0.40.0' of github.com:SnapKit/SnapKit into develop ... # Conflicts: # .travis.yml # CHANGELOG.md # README.md # SnapKit.podspec # SnapKit.xcodeproj/project.pbxproj # SnapKit.xcodeproj/xcshareddata/xcschemes/SnapKit OSX.xcscheme # SnapKit.xcodeproj/xcshareddata/xcschemes/SnapKit iOS.xcscheme # Source/Constraint.swift # Source/ConstraintAttributes.swift # Source/ConstraintDescription.swift # Source/ConstraintMaker.swift # Source/ConstraintView.swift # Source/Debugging.swift # Source/LayoutConstraint.swift # Source/View+SnapKit.swift # Tests/Tests.swift		2016-09-14 20:55:25 +12:00
..
SnapKit Tests.xcscheme	Improve project setup for multiplatform	2016-09-14 20:44:06 +12:00
SnapKit.xcscheme	Merge branch 'feature/0.40.0' of github.com:SnapKit/SnapKit into develop	2016-09-14 20:55:25 +12:00