Merge remote-tracking branch 'origin' into swift-1.2

Browse Source

Conflicts:
	SwiftGit2Tests/RepositorySpec.swift

...

This commit is contained in:

Brian Gesiak 2015-03-07 12:47:27 -05:00

parent 186b5aadc9 21b5235bcc

commit 2ca3ad1a80

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