tykayn
/
mastodon
mirror of https://framagit.org/tykayn/mastodon.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
16,628 Commits 20 Branches 113 Tags 222 MiB
Commit Graph

3 Commits

Author SHA1 Message Date
Jeong Arm bbda3592d8
Translate: Korean (#1790) 
* Translate Korean: glitch frontend

* Translate Korean: backend

* Remove unused string

* Fix yaml
 2022-05-31 11:41:30 +02:00
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
Jeong Arm 69b5139d2a Add Korean translations 2021-08-06 20:06:05 +02:00