Merge branch 'develop' of github.com:martini/zammad into develop

This commit is contained in:
Martin Edenhofer 2015-12-15 12:49:42 +01:00
commit cf39840772

View file

@ -33,6 +33,7 @@ gem 'omniauth-linkedin'
gem 'omniauth-google-oauth2' gem 'omniauth-google-oauth2'
gem 'twitter' gem 'twitter'
gem 'twitter_oauth'
gem 'koala' gem 'koala'
gem 'mail', '~> 2.5.0' gem 'mail', '~> 2.5.0'