mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-17 12:24:31 +00:00
Merge commit '9974163776b3e65e7cfa41e6293876909a1635b7' into glitch-soc/merge-upstream
Conflicts: - `app/views/layouts/admin.html.haml`: Upstream moved `javascript_pack_tag` calls around, but we don't use them in the same way in glitch-soc due to the different theming system. Kept glitch-soc's files unchanged.
This commit is contained in:
commit
80f89f9cf2