merged in Ken Tolers PR without the updated gemfile.lock - whoops

This commit is contained in:
Ken Johnson
2020-06-18 13:54:35 -04:00
parent 7f05a48649
commit ef9ec5929e
+2
View File
@@ -199,6 +199,7 @@ GEM
parallel (1.18.0) parallel (1.18.0)
parser (2.6.5.0) parser (2.6.5.0)
ast (~> 2.4.0) ast (~> 2.4.0)
pg (1.2.3)
poltergeist (1.18.1) poltergeist (1.18.1)
capybara (>= 2.1, < 4) capybara (>= 2.1, < 4)
cliver (~> 0.3.1) cliver (~> 0.3.1)
@@ -364,6 +365,7 @@ DEPENDENCIES
launchy launchy
minitest minitest
mysql2 mysql2
pg
poltergeist poltergeist
powder powder
pry pry