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”. |
||
|---|---|---|
| .. | ||
| admin | ||
| settings | ||
| application_helper.rb | ||
| flashes_helper.rb | ||
| home_helper.rb | ||
| instance_helper.rb | ||
| jsonld_helper.rb | ||
| mailer_helper.rb | ||
| routing_helper.rb | ||
| settings_helper.rb | ||
| stream_entries_helper.rb | ||