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
..
about	…
accounts	Drop glitch-style account bio fields	6 years ago
admin	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
admin_mailer	…
application	Redesign public profiles and toots (#8068)	6 years ago
auth	Redesign public profiles and toots (#8068)	6 years ago
authorize_follows	Redesign public profiles and toots (#8068)	6 years ago
errors	…
filters	…
follower_accounts	Redesign public profiles and toots (#8068)	6 years ago
following_accounts	Redesign public profiles and toots (#8068)	6 years ago
home	…
invites	…
kaminari	…
layouts	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
media	…
notification_mailer	…
oauth	…
remote_follow	Redesign public profiles and toots (#8068)	6 years ago
remote_unfollows	Redesign public profiles and toots (#8068)	6 years ago
settings	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
shared	Redesign public profiles and toots (#8068)	6 years ago
shares	…
stream_entries	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
tags	…
user_mailer	…
well_known	…