Konstantin Haase c706576aa5 Merge branch 'master' into rkh-track-user-agent ... Conflicts: Gemfile.lock		2014-10-30 15:01:58 +01:00
..
integration	fix settings env var api specs	2014-10-07 19:14:40 +02: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 rkh-track-user-agent	2014-10-30 15:01:58 +01:00
spec_helper.rb	fix specs for rspec	2014-10-07 16:48:21 +02:00