Merge upstream changes up to ad95c98054574080ac5d15584b3018d1db836531 - Githubissues

glitch-soc / mastodon

A glitchy but lovable microblogging server

https://glitch-soc.github.io/docs/

GNU Affero General Public License v3.0

708 stars 182 forks source link

Merge upstream changes up to ad95c98054574080ac5d15584b3018d1db836531 #2804

Closed ClearlyClaire closed 3 months ago

ClearlyClaire commented 3 months ago

Conflicts

package.json: Upstream removed their direct dependency autoprefixer, which was textually adjacent to glitch-soc-only dependency atrament. Removed direct dependency on autoprefixer.
yarn.lock: Upstream removed their direct dependency autoprefixer, which was textually adjacent to glitch-soc-only dependency atrament. Removed direct dependency on autoprefixer.

Ported changes

f6dc8ae8e39cbc626b001cd1026a6fa2de8f4215
afdfeb585640af53cf7e9c63d82aa56ca8bae1e4
bb3941f885beee3843742edd31d67901c6ba0995
cc453f222146bf1d48af3edbdc6396e856e81893
2ec1181ee5c409dd6d2f89cdf04e983e84fce9ab
ad95c98054574080ac5d15584b3018d1db836531