mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-21 04:39:23 +00:00
ab59743c13
Conflicts: - `app/views/layouts/mailer.html.haml`: Upstream removed a line close to one modified by glitch-soc. Removed the line as upstream did. |
||
|---|---|---|
| .. | ||
| _actions.html.haml | ||
| _media_attachments.html.haml | ||
| _status.html.haml | ||
| index.html.haml | ||
| show.html.haml | ||