mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-15 11:21:42 +00:00
071c2c9c85
Conflicts: app/javascript/styles/mastodon/components.scss |
||
---|---|---|
.. | ||
assets | ||
json_ld | ||
mastodon | ||
paperclip | ||
tasks | ||
templates/haml/scaffold |