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
..
app	Merge branch 'master' into hh-add-metadata-endpoint	2014-01-17 09:16:41 -05:00
app.rb	Connect logs to a different DB if config is present	2013-11-12 22:05:54 +01:00