Skip to content

Commit

Permalink
Merge branch 'staging'
Browse files Browse the repository at this point in the history
  • Loading branch information
QbDesu committed Dec 26, 2023
2 parents ac597f5 + 8fb1e8f commit 401c4e7
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ gem 'lograge'

group :development do
gem 'bullet'
gem 'capistrano', '~> 3.17.0', group: :capistrano, require: false
gem 'capistrano', '~> 3.17.1', group: :capistrano, require: false
gem 'capistrano-rvm', require: false
gem 'capistrano-rails', require: false
gem 'capistrano-bundler', require: false
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ DEPENDENCIES
bcrypt_pbkdf
bootstrap-sass (~> 3.4.1)
bullet
capistrano (~> 3.17.0)
capistrano (~> 3.17.1)
capistrano-bundler
capistrano-rails
capistrano-rvm
Expand Down
Binary file added app/assets/images/frontend/37c3-key-visual.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 401c4e7

Please sign in to comment.