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
..
admin	…
settings	…
application_helper.rb	Add more granular OAuth scopes (#7929)	6 years ago
flashes_helper.rb	…
home_helper.rb	…
instance_helper.rb	…
jsonld_helper.rb	…
mailer_helper.rb	…
routing_helper.rb	…
settings_helper.rb	Weblate translations (2018-07-25) (#8065)	6 years ago
stream_entries_helper.rb	Redesign public profiles and toots (#8068)	6 years ago