mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-24 00:54:02 -05:00
876aa35350
Conflicts: - `package.json`: Upstream updated a dependency that is on an adjacent line to a glitch-soc-only dependency in that file. Updated as upstream did. - `yarn.lock`: Upstream updated a dependency that is on an adjacent line to a glitch-soc-only dependency in that file. Updated as upstream did. |
||
|---|---|---|
| .. | ||
| _account.html.haml | ||
| _button.html.haml | ||
| _checklist.html.haml | ||
| _feature.html.haml | ||
| _follow.html.haml | ||
| _frame.html.haml | ||
| _hashtag.html.haml | ||
| _heading.html.haml | ||