mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-13 00:45:17 +00: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. |
||
---|---|---|
.. | ||
_action_log.html.haml | ||
_status.html.haml | ||
index.html.haml | ||
show.html.haml |