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

Merge commit '34e826f373d20f6230d1ef0aa03ad41a3bdf5998' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `app/helpers/theme_helper.rb`:
  Conflict caused by our different theme systems.
  Ported upstream's changes.
- `app/models/account.rb`:
  Upstream basically made a change we already made.
  Moved constant declaration to match upstream.
This commit is contained in:
Claire
2024-05-01 18:56:48 +02:00
parent 2d43547934 34e826f373
commit 6f342a6d4c
41 changed files with 588 additions and 153 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.2
uses: peter-evans/create-pull-request@v6.0.3
with:
commit-message: 'New Crowdin translations'
title: 'New Crowdin Translations (automated)'