Merge branch 'release/v1.0.2'

odinsride · May 18, 2018 · cf4461b · cf4461b
2 parents 88e84f1 + f7d9276
commit cf4461b
Show file tree

Hide file tree

Showing 14 changed files with 754 additions and 60 deletions.
diff --git a/Gemfile b/Gemfile
@@ -24,7 +24,8 @@ gem 'bootstrap', '~> 4.0.0'
 gem 'jquery-rails'
 gem 'devise'
 gem 'will_paginate', '~> 3.1.0'
-
+gem "paperclip", "~> 6.0.0"
+gem "aws-sdk"
 gem 'figaro'
 
 # Use CoffeeScript for .coffee assets and views