Hiro Asari 6d3a65b541 Merge branch 'master' into ps-env-vars-in-settings ... Conflicts: Gemfile.lock		2014-06-18 08:38:49 -04:00
..
app	Fix another variable.	2014-06-18 11:55:27 +02:00
v2	Add settings endpoint for env_vars	2014-05-23 13:42:22 +02:00
app.rb	Merge branch 'master' into ps-env-vars-in-settings	2014-06-18 08:38:49 -04:00
serializer.rb	Allow to handle settings collections	2014-04-01 12:00:06 +02:00
v2.rb	Move API v2 payload definitions to travis-api from travis-core	2014-03-24 20:25:06 +01:00