mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-10-19 05:54:43 +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 | ||