mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-15 23:54:52 +01:00
dc2ab6e646
Conflicts: - `app/javascript/packs/public.js`: Upstream removed an unused function in code that has been refactored a bit. Removed that function in the corresponding places. |
||
---|---|---|
.. | ||
_custom_emoji.html.haml | ||
index.html.haml | ||
new.html.haml |