Merge branch 'master' of github.com:blindsidenetworks/greenlight

2016-10-18 10:03:50 -04:00
parent f725b7f1bc 352abe78af
commit e9caa740aa
17 changed files with 148 additions and 17 deletions
--- a/1
+++ b/1
@ -50,7 +50,6 @@ end
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

-gem 'devise', '4.2.0'
 gem 'omniauth', '1.3.1'
 gem 'omniauth-twitter', '1.2.1'
 gem 'omniauth-google-oauth2', '0.4.1'