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
..
2020-11-04 20:45:01 +01:00
2018-10-04 12:36:53 +02:00
2017-06-19 11:31:37 +02:00
2018-10-04 12:36:53 +02:00
2018-10-04 12:36:53 +02:00
2020-06-02 19:24:53 +02:00
2017-06-19 01:38:50 +02:00
2020-10-12 16:33:49 +02:00
2018-10-04 12:36:53 +02:00
2018-10-04 12:36:53 +02:00
2017-04-05 00:29:56 +02:00
2018-10-04 12:36:53 +02:00
2020-06-02 19:24:53 +02:00
2019-03-03 22:18:23 +01:00
2018-10-04 12:36:53 +02:00
2021-02-21 19:50:12 +01:00
2020-06-02 19:24:53 +02:00
2021-04-25 06:33:28 +02:00