Konstantin Haase df64ee29c8 Merge branch 'master' into rkh-v3 ... Conflicts: Gemfile Gemfile.lock lib/travis/api/app.rb		2015-01-21 16:52:21 +01:00
..
tasks	Rename encyrpt_all_data.rake to encrypt_all_data.rake	2014-06-19 17:52:03 -04:00
travis	Merge branch 'master' into rkh-v3	2015-01-21 16:52:21 +01:00
conditional_skylight.rb	remove dyno count check	2015-01-19 15:49:54 +01:00