Skip to content

Commit

Permalink
Merge branch 'develop' into staging
Browse files Browse the repository at this point in the history
  • Loading branch information
zmcNotafraid committed Oct 29, 2024
2 parents d63e4ed + ebfdb5f commit 9381f2a
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -404,8 +404,7 @@ GEM
redis-objects (2.0.0.beta)
redis (~> 5.0)
regexp_parser (2.7.0)
rexml (3.3.6)
strscan
rexml (3.3.9)
rubocop (1.50.1)
json (~> 2.3)
parallel (~> 1.10)
Expand Down Expand Up @@ -460,7 +459,6 @@ GEM
spring-watcher-listen (2.1.0)
listen (>= 2.7, < 4.0)
spring (>= 4)
strscan (3.1.0)
thor (1.3.1)
timeout (0.4.1)
timers (4.3.5)
Expand Down

0 comments on commit 9381f2a

Please sign in to comment.