Merge branch 'swift-2.0' of github.com:SnapKit/SnapKit into swift-2.0

Browse Source

# Conflicts:
#	Source/Constraint.swift
#	Source/ConstraintMaker.swift

...

This commit is contained in:

Robert Payne 2015-07-30 19:37:09 +12:00

parent 446e5c5758 e9c9f6fe8e

commit 4f19419528

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available