mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-24 06:46:29 +00:00
24968d20a0
Conflicts: - app/controllers/directories_controller.rb - package.json - yarn.lock |
||
---|---|---|
.. | ||
assets | ||
devise | ||
generators | ||
json_ld | ||
mastodon | ||
paperclip | ||
tasks | ||
templates | ||
cli.rb |