Thibaut Girka 12c8ac9e14 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict due to glitch-soc having to take care of local-only pinned toots in that controller. Took upstream's changes and restored the local-only special handling. - `app/controllers/auth/sessions_controller.rb`: Minor conflicts due to the theming system, applied upstream changes, adapted the following two files for glitch-soc's theming system: - `app/controllers/concerns/sign_in_token_authentication_concern.rb` - `app/controllers/concerns/two_factor_authentication_concern.rb` - `app/services/backup_service.rb`: Minor conflict due to glitch-soc having to handle local-only toots specially. Applied upstream changes and restored the local-only special handling. - `app/views/admin/custom_emojis/index.html.haml`: Minor conflict due to the theming system. - `package.json`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. - `yarn.lock`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file.		2020-06-09 10:39:20 +02:00
..
_domain_blocks.html.haml	Fix long domain block descriptions breaking table layout (#12029)	2019-10-01 04:54:29 +02:00
_login.html.haml	Fix duplicate HTML ids in /about (#11803)	2019-09-10 20:55:23 +02:00
_registration.html.haml	Fix blur behind closed registration message (#12442)	2019-11-22 15:56:59 +01:00
more.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-09 10:39:20 +02:00
show.html.haml	Fix some account avatars on public pages having incorrect size (#13692)	2020-05-13 21:20:34 +02:00
terms.html.haml