mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-25 17:53:41 +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. |
||
---|---|---|
.. | ||
_account.html.haml | ||
show.html.haml |