Merge branch 'story/105852786-directo' into staging

# Conflicts:
#	Gemfile
This commit is contained in:
Vladimir Krylov 2016-01-18 14:14:38 +02:00
commit 30b057d535
8 changed files with 104 additions and 9 deletions

View file

@ -13,6 +13,7 @@ gem 'iso8601', '0.8.6' # for dates and times
gem 'hashie-forbidden_attributes', '0.1.1'
gem 'SyslogLogger', '2.0', require: 'syslog/logger'
gem 'parallel'
gem 'rest-client'
# load env
gem 'figaro', '1.1.1'