Claire 3160e050a9 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/accounts/_header.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/directories/index.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change.		2021-07-08 16:17:19 +02:00
..
aliases
applications
deletes
exports	Fix reference to non-existing translation in the exports page. (#15894)	2021-03-15 02:17:29 +01:00
featured_tags	Change number_to_human calls to always use 3-digits precision (#16469)	2021-07-07 21:13:08 +02:00
flavours
identity_proofs
imports
login_activities	Add full user agent in tooltips for login activities (#16428)	2021-06-23 16:42:23 +02:00
migration/redirects
migrations
preferences	Merge branch 'master' into glitch-soc/merge-upstream	2020-10-21 19:10:50 +02:00
profiles
shared
two_factor_authentication	Add subresource integrity for JS and CSS assets (#15096)	2020-11-06 11:56:31 +01:00
two_factor_authentication_methods