mastodon

mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00

History

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

Fix account aliases page (#13452 )

2020-04-13 06:41:43 +02:00

applications

Various fixes and improvements (#12878 )

2020-01-20 15:55:03 +01:00

deletes

Fix 2FA challenge and password challenge for non-database users (#11831 )

2019-09-15 21:08:39 +02:00

exports

Fix reference to non-existing translation in the exports page. (#15894 )