mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-16 07:06:45 +00:00
2ca965c704
Conflicts: app/javascript/styles/mastodon/components.scss app/javascript/styles/mastodon/modal.scss |
||
|---|---|---|
| .. | ||
| _theme.html.haml | ||
| admin.html.haml | ||
| application.html.haml | ||
| auth.html.haml | ||
| embedded.html.haml | ||
| error.html.haml | ||
| mailer.html.haml | ||
| mailer.text.erb | ||
| modal.html.haml | ||
| plain_mailer.html.haml | ||
| public.html.haml | ||