Hiro Asari a622de2a9f Merge branch 'master' into hh-add-metadata-endpoint ... Update Gemfile.lock to point to the updated travis-core PR Conflicts: Gemfile.lock lib/travis/api/app/endpoint/jobs.rb spec/integration/v2/jobs_spec.rb		2014-01-17 09:16:41 -05:00
..
tasks	Update encryption task	2013-08-15 13:46:05 +02:00
travis/api	Merge branch 'master' into hh-add-metadata-endpoint	2014-01-17 09:16:41 -05:00