This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

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	…
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	…
profiles	…
shared	…
two_factor_authentication	…
two_factor_authentication_methods	…