Hiro Asari 6d3a65b541 Merge branch 'master' into ps-env-vars-in-settings ... Conflicts: Gemfile.lock		2014-06-18 08:38:49 -04:00
..
integration	Merge branch 'master' into ps-env-vars-in-settings	2014-06-18 08:38:49 -04:00
support	Move API v2 payload definitions to travis-api from travis-core	2014-03-24 20:25:06 +01:00
unit	Merge branch 'master' into ha-feature-remove_log_endpoint	2014-06-17 10:40:30 -04:00
spec_helper.rb	Allow to handle settings collections	2014-04-01 12:00:06 +02:00