mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-17 20:32:56 +00:00
fbfc4145fd
Conflicts: - `app/javascript/packs/public.jsx`: Upstream updated code that we actually moved to `app/javascript/core/settings.js`. Applied the changes there. |
||
---|---|---|
.. | ||
v1 | ||
v2 | ||
web |