mirror of https://github.com/Siphonay/mastodon
2b0410f903
Conflicts: - `app/helpers/application_helper.rb`: Upstream added a helper, while glitch-soc had extra helpers. Added upstream's helper. |
||
|---|---|---|
| .. | ||
| _account.html.haml | ||
| _button.html.haml | ||
| _checklist.html.haml | ||
| _feature.html.haml | ||
| _follow.html.haml | ||
| _frame.html.haml | ||
| _hashtag.html.haml | ||
| _heading.html.haml | ||