~cytrogen/masto-fe

ref: abdb58840ae4d1e6c5e0355952871bcff62ffbc5 masto-fe/app/javascript/mastodon/locales/ko.json -rw-r--r-- 50.9 KiB
abdb5884 — Claire 2 years ago 
Merge commit '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream
736fe753 — github-actions[bot] 2 years ago 
New Crowdin Translations (automated) (#27080)

Co-authored-by: GitHub Actions <noreply@github.com>
e8245855 — github-actions[bot] 2 years ago 
New Crowdin Translations (automated) (#27052)

Co-authored-by: GitHub Actions <noreply@github.com>
c04b08a3 — Claire 2 years ago 
Merge pull request #2419 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
f05985f8 — Claire 2 years ago 
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `README.md`:
  Upstream changed their README, we have a completely different one.
  Kept our version.
effe4728 — github-actions[bot] 2 years ago 
New Crowdin Translations (automated) (#27005)

Co-authored-by: GitHub Actions <noreply@github.com>
61fe25fe — github-actions[bot] 2 years ago 
New Crowdin Translations (automated) (#26988)

Co-authored-by: GitHub Actions <noreply@github.com>
6f658680 — Claire 2 years ago 
Merge pull request #2413 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to a83615edc9fc1ce3363ddcf1fc676806421a5f65
1e87575b — Claire 2 years ago 
Merge commit '6eb6209d02514c5271238a23601be643c7b9f52d' into glitch-soc/merge-upstream
1b4902fa — github-actions[bot] 2 years ago 
New Crowdin Translations (automated) (#26913)

Co-authored-by: GitHub Actions <noreply@github.com>
743fede5 — Claire 2 years ago 
Merge pull request #2406 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 6273416292090b2f6bfda33f070cea325a1759df
5ed72f66 — Claire 2 years ago 
Merge commit 'b90383d07388fe8513e59a6deb1a2391146c6561' into glitch-soc/merge-upstream
921c6fe6 — github-actions[bot] 2 years ago 
New Crowdin Translations (automated) (#26498)

Co-authored-by: GitHub Actions <noreply@github.com>
4f1d2262 — Claire 2 years ago 
Merge pull request #2378 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 3a8370e1f459f5cf9695a610102ae6e53df36714
7e25e311 — Claire 2 years ago 
Merge commit '3a8370e1f459f5cf9695a610102ae6e53df36714' into glitch-soc/merge-upstream
c452ccd9 — github-actions[bot] 2 years ago 
New Crowdin Translations (automated) (#26444)

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
86ba8d3e — Claire 2 years ago 
Merge pull request #2368 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 496eb6f7a4fa7de54f26da9642a76e6884648102
6530f970 — Claire 2 years ago 
Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main

Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore.
8cbf4a52 — github-actions[bot] 2 years ago 
New Crowdin Translations (automated) (#26373)

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
d2dbaba4 — github-actions[bot] 2 years ago 
New Crowdin Translations (automated) (#26209)

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Next