mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-28 03:03:27 +00:00
0158937fc2
Conflicts:
- Dockerfile
Took upstream version and reverted
|
||
---|---|---|
.. | ||
assets | ||
devise | ||
generators | ||
json_ld | ||
mastodon | ||
paperclip | ||
tasks | ||
templates | ||
cli.rb |