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
..
account_avatar.rb	…
account_finder_concern.rb	…
account_header.rb	Redesign public profiles and toots (#8068)	6 years ago
account_interactions.rb	Merge branch 'master' into glitch-soc/tentative-merge	6 years ago
attachmentable.rb	Restore support to ruby 2.3, add ruby 2.3 to circle ci (#7935)	6 years ago
cacheable.rb	…
expireable.rb	Keyword/phrase filtering (#7905)	6 years ago
omniauthable.rb	…
paginable.rb	…
relationship_cacheable.rb	…
remotable.rb	Fix fetch of remote image with multiple Content-Type headers (#7749)	6 years ago
status_threading_concern.rb	…
streamable.rb	…