Merge remote-tracking branch 'origin/plantings-show' into plantings-show

This commit is contained in:
Brenda Wallace
2019-04-20 13:22:21 +12:00

View File

@@ -308,7 +308,7 @@ GEM
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
oj (3.7.11)
oj (3.7.12)
omniauth (1.9.0)
hashie (>= 3.4.6, < 3.7.0)
rack (>= 1.6.2, < 3)