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
..
_bio.html.haml	Add Keybase integration (#10297)	2019-03-18 21:00:55 +01:00
_header.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-08 16:17:19 +02:00
_moved.html.haml	Fix end-user-facing uses of inline CSS (#13438)	2020-04-28 10:16:55 +02:00
_og.html.haml	Fix various issues around OpenGraph representation of media (#14133)	2020-06-25 01:33:01 +02:00
show.html.haml	Change number_to_human calls to always use 3-digits precision (#16469)	2021-07-07 21:13:08 +02:00