mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02: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 |
||
---|---|---|
.. | ||
_theme.html.haml | ||
admin.html.haml | ||
application.html.haml | ||
auth.html.haml | ||
embedded.html.haml | ||
error.html.haml | ||
mailer.html.haml | ||
mailer.text.erb | ||
modal.html.haml | ||
plain_mailer.html.haml | ||
public.html.haml |