Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-26 04:16:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'ffc5be4820ed7bad4656489f096230dd7965140b' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `package.json`:
  Upstream updated a dependency that is on an adjacent line to a
  glitch-soc-only dependency in that file.
  Updated as upstream did.
- `yarn.lock`:
  Upstream updated a dependency that is on an adjacent line to a
  glitch-soc-only dependency in that file.
  Updated as upstream did.
This commit is contained in:
Claire
2024-03-19 19:21:12 +01:00
parent ada2ac411a ffc5be4820
commit 876aa35350
247 changed files with 2447 additions and 1987 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/crowdin-download.yml vendored
View File

@@ -53,7 +53,7 @@ jobs:
# Create or update the pull request
- name: Create Pull Request
uses: peter-evans/create-pull-request@v6.0.1
uses: peter-evans/create-pull-request@v6.0.2
with:
commit-message: 'New Crowdin translations'
title: 'New Crowdin Translations (automated)'