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
..
account/components	Public profile endorsements (accounts picked by profile owner) (#8146)	6 years ago
account_gallery	Do not scroll up when modal is opened (#8095)	6 years ago
account_timeline	Public profile endorsements (accounts picked by profile owner) (#8146)	6 years ago
blocks	Do not scroll up when modal is opened (#8095)	6 years ago
community_timeline	Do not scroll up when modal is opened (#8095)	6 years ago
compose	…
direct_timeline	Do not scroll up when modal is opened (#8095)	6 years ago
domain_blocks	Do not scroll up when modal is opened (#8095)	6 years ago
emoji	…
favourited_statuses	Do not scroll up when modal is opened (#8095)	6 years ago
favourites	Do not scroll up when modal is opened (#8095)	6 years ago
follow_requests	Do not scroll up when modal is opened (#8095)	6 years ago
followers	Do not scroll up when modal is opened (#8095)	6 years ago
following	Do not scroll up when modal is opened (#8095)	6 years ago
generic_not_found	…
getting_started	…
hashtag_timeline	Do not scroll up when modal is opened (#8095)	6 years ago
home_timeline	Do not scroll up when modal is opened (#8095)	6 years ago
keyboard_shortcuts	…
list_editor	…
list_timeline	Do not scroll up when modal is opened (#8095)	6 years ago
lists	…
mutes	Do not scroll up when modal is opened (#8095)	6 years ago
notifications	…
pinned_statuses	Do not scroll up when modal is opened (#8095)	6 years ago
public_timeline	Do not scroll up when modal is opened (#8095)	6 years ago
reblogs	Do not scroll up when modal is opened (#8095)	6 years ago
report	…
standalone	…
status	Do not scroll up when modal is opened (#8095)	6 years ago
trends	…
ui	Compensate for scrollbar disappearing when media modal visible (#8100)	6 years ago
video	…