Skip to content

Commit

Permalink
Merge branch 'master' into flag-submission-box-disappears-mitre-cyber…
Browse files Browse the repository at this point in the history
  • Loading branch information
camdenmoors authored Aug 18, 2020
2 parents b081cd9 + 184a071 commit 99f4ffb
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ GEM
awesome_nested_fields (0.6.4)
rails (>= 3.0.0)
bcrypt (3.1.13)
bootsnap (1.4.7)
bootsnap (1.4.8)
msgpack (~> 1.0)
bootstrap-kaminari-views (0.0.5)
kaminari (>= 0.13)
Expand Down Expand Up @@ -207,7 +207,7 @@ GEM
paper_trail (10.3.1)
activerecord (>= 4.2)
request_store (~> 1.1)
paper_trail-association_tracking (2.0.0)
paper_trail-association_tracking (2.1.0)
parallel (1.19.2)
parser (2.7.1.4)
ast (~> 2.4.1)
Expand Down Expand Up @@ -324,12 +324,12 @@ GEM
sprockets (> 3.0)
sprockets-rails
tilt
scout_apm (2.6.8)
scout_apm (2.6.9)
parser
sentry-raven (3.0.0)
faraday (>= 1.0)
sexp_processor (4.15.0)
simplecov (0.18.5)
simplecov (0.19.0)
docile (~> 1.1)
simplecov-html (~> 0.11)
simplecov-html (0.12.2)
Expand Down

0 comments on commit 99f4ffb

Please sign in to comment.