Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 15:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
- `Gemfile.lock`:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version.
- `README.md`:
  Upstream updated its README, we have a completely different one.
  Kept glitch-soc's README.
- `app/models/account.rb`:
  Not a real conflict, upstream updated some lines textually adjacent
  to glitch-soc-specific lines.
  Ported upstream's changes.
This commit is contained in:
Claire
2024-02-24 14:46:14 +01:00
parent 3c36e1be68 c645490d55
commit ef3d15554b
146 changed files with 1608 additions and 731 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@v5.0.2
uses: peter-evans/create-pull-request@v6.0.0
with:
commit-message: 'New Crowdin translations'
title: 'New Crowdin Translations (automated)'