resolve conflicts with master

2021-03-21 12:59:43 -07:00 · 2021-03-21 12:59:43 -07:00 · f22ad296af
commit f22ad296af
parent 4d1edf5872 9f558c68c2
59 changed files with 669 additions and 629 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -127,6 +127,8 @@ GEM
      aws_cf_signer
      rest-client
    cocoon (1.2.15)
+    codecov (0.5.0)
+      simplecov (>= 0.15, < 0.22)
    coderay (1.1.1)
    concurrent-ruby (1.1.8)
    countable-rails (0.0.1)