mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-22 05:08:03 +00:00
33c80e0783
Conflicts: - app/models/media_attachment.rb |
||
---|---|---|
.. | ||
assets | ||
devise | ||
generators | ||
json_ld | ||
mastodon | ||
paperclip | ||
tasks | ||
templates | ||
cli.rb |