mirror of https://github.com/Siphonay/mastodon
ac2370778a
Conflicts: - `config/environments/production.rb`: Upstream enforced a code style change and glitch-soc had a few different lines. Applied upstream's code style to glitch-soc's changes. |
||
|---|---|---|
| .. | ||
| _attachment_list.html.haml | ||
| _detailed_status.html.haml | ||
| _og_description.html.haml | ||
| _og_image.html.haml | ||
| _poll.html.haml | ||
| _simple_status.html.haml | ||
| _status.html.haml | ||
| embed.html.haml | ||
| show.html.haml | ||