mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-16 20:03:24 +00:00
b735954971
Conflicts: - `config/webpack/generateLocalePacks.js`: A dependency update changed how functions are imported. Also, some linting fixes not applicable to glitch-soc. |
||
---|---|---|
.. | ||
actions | ||
_actions.html.haml | ||
_media_attachments.html.haml | ||
_status.html.haml | ||
index.html.haml | ||
show.html.haml |