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 e5a603206d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/accounts_controller.rb app/javascript/mastodon/locales/pl.json app/views/about/more.html.haml Conflicts in `accounts_controller.rb` resolved by taking upstream's version + our `use_pack`. Conflicts in `pl.json` resolved by taking upstream's changes. Conflicts in `aboute/more.html.haml` resolved by taking upstream's changes.		6 years ago
..
about	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
accounts	Public profile endorsements (accounts picked by profile owner) (#8146)	6 years ago
admin	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
admin_mailer	…
application	Add separate setting for sidebar text (site_short_description) (#8107)	6 years ago
auth	Redesign public profiles and toots (#8068)	7 years ago
authorize_follows	Redesign public profiles and toots (#8068)	7 years ago
errors	…
filters	Add option to not consider word boundaries when processing keyword filtering (#7975)	7 years ago
follower_accounts	Redesign public profiles and toots (#8068)	7 years ago
following_accounts	Redesign public profiles and toots (#8068)	7 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)	7 years ago
remote_unfollows	Redesign public profiles and toots (#8068)	7 years ago
settings	Delete leftovers from keyword_mutes	6 years ago
shared	Add separate setting for sidebar text (site_short_description) (#8107)	6 years ago
shares	…
stream_entries	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
tags	…
user_mailer	…
well_known	…