Merge branch 'master' into glitch-soc/merge-upstream

This commit is contained in:
Claire
2021-01-18 13:57:12 +01:00
18 changed files with 48 additions and 43 deletions

View File

@@ -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')