mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-14 14:29:28 +00:00
5fd8780b14
Conflicts: - `package.json`: Not really a conflict, upstream updated a dependency textually adjacent to a glitch-soc-only one. Updated the dependency as upstream did. |
||
---|---|---|
.. | ||
_bio.html.haml | ||
_header.html.haml | ||
_moved.html.haml | ||
_og.html.haml | ||
show.html.haml | ||
show.rss.ruby |