Not sure if this is something you might want, but with the upcoming security fix coming in Mastodon upstream (https://mastodon.social/@Mastodon/103713946448947053), I figured we might as well include change from the 2.9.3 (and soon to be released 2.9.4) Mastodon releases here.
I'm going to test this on my server to ensure nothing is broken.
Note: there may be a better way, this is what I've done:
git remote add mastodon https://github.com/tootsuite/mastodon.git
git fetch mastodon
git merge v2.9.3
# reviewed/fix a few conflicts
Not sure if this is something you might want, but with the upcoming security fix coming in Mastodon upstream (https://mastodon.social/@Mastodon/103713946448947053), I figured we might as well include change from the 2.9.3 (and soon to be released 2.9.4) Mastodon releases here.
I'm going to test this on my server to ensure nothing is broken.
Note: there may be a better way, this is what I've done:
I realize there is also https://github.com/florence-social/mastodon-fork/pull/135 so I'm not sure what to do.