Merge branch 'dev' into photos/seeds

This commit is contained in:
Brenda Wallace
2019-02-15 09:21:35 +13:00
committed by GitHub

View File

@@ -55,7 +55,7 @@ GEM
public_suffix (>= 2.0.2, < 4.0)
arel (9.0.0)
ast (2.4.0)
autoprefixer-rails (9.4.3)
autoprefixer-rails (9.4.7)
execjs
bcrypt (3.1.12)
better_errors (2.5.0)
@@ -71,7 +71,7 @@ GEM
bootstrap-kaminari-views (0.0.5)
kaminari (>= 0.13)
rails (>= 3.1)
bootstrap-sass (3.4.0)
bootstrap-sass (3.4.1)
autoprefixer-rails (>= 5.2.1)
sassc (>= 2.0.0)
builder (3.2.3)