mastodon

Author	SHA1	Message	Date
Claire	67da47d081	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
Claire	77aea4f85f	Change number_to_human calls to always use 3-digits precision (#16469 ) Fixes #16435	2021-07-07 21:13:08 +02:00
Claire	069a6ab162	Fix the follow recommendation admin page on glitch-soc	2021-04-20 12:22:50 +02:00
Eugen Rochko	6d78b064e3	Fix missing source strings and inconsistent lead text style in admin UI (#16052 )	2021-04-17 11:12:49 +02:00
Eugen Rochko	92b2d926bf	Add cold-start follow recommendations (#15945 )	2021-04-12 12:37:14 +02:00