mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-09-10 20:27:12 +00:00
# Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.rb |
||
---|---|---|
.. | ||
assets | ||
json_ld | ||
mastodon | ||
paperclip | ||
tasks | ||
templates/haml/scaffold |