From 88d22463d9e33377bf37686f27b84c1e4b45d3c7 Mon Sep 17 00:00:00 2001 From: Jeremy Kescher Date: Tue, 21 Feb 2023 00:53:40 +0100 Subject: [PATCH] Merge remote-tracking branch 'upstream/main' into develop # Conflicts: # Gemfile # Gemfile.lock # config/sidekiq.yml --- lib/mastodon/version.rb | 2 +- yarn.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index 13334ca0ed..50533f48a8 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -25,7 +25,7 @@ module Mastodon end def suffix_version - '+1.0.1' + '+2.0.0' end def to_a diff --git a/yarn.lock b/yarn.lock index d0c4a1926e..921695c00d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1469,7 +1469,7 @@ "@types/yargs" "^16.0.0" chalk "^4.0.0" -"@jest/types@^29.4.2", "@jest/types@^29.4.3": +"@jest/types@^29.4.3": version "29.4.3" resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.4.3.tgz#9069145f4ef09adf10cec1b2901b2d390031431f" integrity sha512-bPYfw8V65v17m2Od1cv44FH+SiKW7w2Xu7trhcdTLUmSv85rfKsP+qXSjO4KGJr4dtPSzl/gvslZBXctf1qGEA== @@ -6813,7 +6813,7 @@ jest-snapshot@^29.4.3: pretty-format "^29.4.3" semver "^7.3.5" -jest-util@^29.4.2, jest-util@^29.4.3: +jest-util@^29.4.3: version "29.4.3" resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.4.3.tgz#851a148e23fc2b633c55f6dad2e45d7f4579f496" integrity sha512-ToSGORAz4SSSoqxDSylWX8JzkOQR7zoBtNRsA7e+1WUX5F8jrOwaNpuh1YfJHJKDHXLHmObv5eOjejUd+/Ws+Q==