You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

imncls c0aabbec0f Merge branch 'master' of https://github.com/tootsuite/mastodon ... # 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		7 years ago
..
_theme.html.haml	Various fixes	7 years ago
admin.html.haml	Finalized theme loading and stuff	7 years ago
application.html.haml	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
auth.html.haml	Merge branch 'master' of https://github.com/tootsuite/mastodon	7 years ago
embedded.html.haml	Minor fixes	7 years ago
error.html.haml	Finalized theme loading and stuff	7 years ago
mailer.html.haml	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
mailer.text.erb	Replace tutorial modal with welcome e-mail (#6273)	7 years ago
modal.html.haml	Merge branch 'master' of https://github.com/tootsuite/mastodon	7 years ago
plain_mailer.html.haml	HTML e-mails for UserMailer (#6256)	7 years ago
public.html.haml	Merge branch 'master' of https://github.com/tootsuite/mastodon	7 years ago