about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2021-01-18 13:57:12 +0100
committerClaire <claire.github-309c@sitedethib.com>2021-01-18 13:57:12 +0100
commite202314a75d3277c26f151764ff183d61dd2f9d0 (patch)
treec8f898f74d17137205f5324f8189c71f36bf913b /config
parenta7a47834e50645746355e2b9a88244c1804c73cd (diff)
parente46b50e805e80d78c0efa39af3bd822912f2cdb9 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'config')
-rw-r--r--config/deploy.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/deploy.rb b/config/deploy.rb
index 5d6873588..c0d72f48f 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-lock '3.14.1'
+lock '3.15.0'
 
 set :repo_url, ENV.fetch('REPO', 'https://github.com/tootsuite/mastodon.git')
 set :branch, ENV.fetch('BRANCH', 'master')