mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-11-22 14:08:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/main' into develop

Browse source 
# Conflicts:
#	Gemfile
#	Gemfile.lock
#	config/sidekiq.yml
This commit is contained in:
Jeremy Kescher 2023-02-21 00:53:40 +01:00
parent 0e634397c3
commit 88d22463d9
No known key found for this signature in database
GPG key ID: 48DFE4BB15BA5940
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/mastodon/version.rb
View file

@ -25,7 +25,7 @@ module Mastodon
end
def suffix_version
'+1.0.1'
'+2.0.0'
end
def to_a

4
yarn.lock
View file

@ -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==