diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-03-17 19:23:39 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-03-17 19:23:39 +0100 |
| commit | 4e3c68e0256e6aab4bb30f350dac4fc4386cb0b9 (patch) | |
| tree | 00a495e6f4abf68dbb9ecceae729c9e5345c318a /lib | |
| parent | ac300173f68d2497cccf4e5bf558d95fc6105c96 (diff) | |
| parent | 443d114574ef152f14815afc5c4ed5c977dd9205 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/helpers/accounts_helper.rb`: Upstream fixed an issue that glitch-soc did not have, in a place with glitch-soc changes to hide the number of followers. Kept glitch-soc's code.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mastodon/maintenance_cli.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mastodon/maintenance_cli.rb b/lib/mastodon/maintenance_cli.rb index 33beec236..6e5242bff 100644 --- a/lib/mastodon/maintenance_cli.rb +++ b/lib/mastodon/maintenance_cli.rb @@ -14,7 +14,7 @@ module Mastodon end MIN_SUPPORTED_VERSION = 2019_10_01_213028 # rubocop:disable Style/NumericLiterals - MAX_SUPPORTED_VERSION = 2022_03_10_060959 # rubocop:disable Style/NumericLiterals + MAX_SUPPORTED_VERSION = 2022_03_16_233212 # rubocop:disable Style/NumericLiterals # Stubs to enjoy ActiveRecord queries while not depending on a particular # version of the code/database |