mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-12 22:25:10 +01:00
54148b9a4a
Conflicts: app/controllers/authorize_follows_controller.rb app/javascript/styles/mastodon/components.scss |
||
|---|---|---|
| .. | ||
| _theme.html.haml | ||
| admin.html.haml | ||
| application.html.haml | ||
| auth.html.haml | ||
| embedded.html.haml | ||
| error.html.haml | ||
| mailer.text.erb | ||
| modal.html.haml | ||
| public.html.haml | ||