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	…
auth	…
authorize_follows	…
errors	New error page graphic. Other error page improvements (#5099)	7 years ago
filters	…
follower_accounts	…
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	Delete leftovers from keyword_mutes	6 years ago
shared	…
shares	…
stream_entries	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
tags	…
user_mailer	…
well_known	…