Merge branch 'master' of github.com:travis-ci/travis-api

Browse Source

Conflicts:
	spec/integration/v1/branches_spec.rb
	spec/integration/v1/builds_spec.rb
	spec/spec_helper.rb

...

This commit is contained in:

Sven Fuchs 2012-10-02 16:40:37 +02:00

parent 289f7c1486 2755d66c48

commit 9851d1b276

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