mirror of
https://github.com/funamitech/mastodon
synced 2024-12-12 21:59:04 +09:00
bb6988a7ac
# 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 |
||
---|---|---|
.. | ||
_contact.html.haml | ||
_features.html.haml | ||
_forms.html.haml | ||
_links.html.haml | ||
_registration.html.haml | ||
more.html.haml | ||
show.html.haml | ||
terms.html.haml |