fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-26 18:44:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/views/accounts
History
Claire 9b861d56a9 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.env.production.sample`:
  Copied upstream changes.
- `app/controllers/settings/identity_proofs_controller.rb`:
  Minor conflict due to glitch-soc's extra “enable_keybase” setting.
  Upstream removed keybase support altogether, so did the same.
- `app/controllers/well_known/keybase_proof_config_controller.rb`:
  Minor conflict due to glitch-soc's extra “enable_keybase” setting.
  Upstream removed keybase support altogether, so did the same.
- `lib/mastodon/statuses_cli.rb`:
  Minor conflict due to an optimization that wasn't shared between
  the two versions. Copied upstream's version.
2021-11-26 22:53:55 +01:00
..
_bio.html.haml Remove Keybase integration (#17045) 2021-11-26 05:58:18 +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