mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-17 15:35:10 +00:00
c1c514ca70
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”. |
||
|---|---|---|
| .. | ||
| _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 | ||