mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-28 03:03:27 +00:00
e9ad99bc93
Conflicts: - `package.json`: Not really a conflict, just some glitch-soc-specific dependency too close to an upstream-updated one. |
||
|---|---|---|
| .. | ||
| _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 | ||