Auto-merged master into sf-ar-te on deployment.

This commit is contained in:
Tyranja 2016-03-22 12:37:52 +01:00
commit 92ec0e352a

View File

@ -11,6 +11,7 @@ gem 'travis-amqp', github: 'travis-ci/travis-amqp'
gem 'travis-config', '~> 0.1.0'
gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs', require: nil
gem 'travis-yaml', github: 'travis-ci/travis-yaml'
gem 'travis-migrations', github: 'travis-ci/travis-migrations'
gem 'mustermann', github: 'rkh/mustermann'
gem 'sinatra'
gem 'sinatra-contrib', require: nil #github: 'sinatra/sinatra-contrib', require: nil
@ -42,7 +43,6 @@ group :test do
gem 'factory_girl', '~> 2.4.0'
gem 'mocha', '~> 0.12'
gem 'database_cleaner', '~> 0.8.0'
gem 'travis-migrations', github: 'travis-ci/travis-migrations'
end
group :development do