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.

Thibaut Girka c1c514ca70 Merge branch 'master' into glitch-soc/merge-upstream ... Manually-resolved conflicts: .circleci/config.yml app/controllers/accounts_controller.rb app/controllers/auth/passwords_controller.rb app/controllers/statuses_controller.rb app/javascript/packs/public.js app/models/media_attachment.rb app/views/stream_entries/_content_spoiler.html.haml app/views/stream_entries/_media.html.haml config/locales/en.yml config/locales/ja.yml config/locales/pl.yml lib/mastodon/version.rb Some content from app/javascript/packs/public.js has been split to app/javascript/core/settings.js. Translation strings for glitch-soc's keyword mutes were dropped. Everything else was mostly “take both”.		6 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	Hardcode default skin/theme in error layout (fixes #373)	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' into glitch-soc/merge-upstream	6 years ago