tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream updated `docker/build-push-action`, and we a different config
  for `docker/metadata-action` so the lines directly above were different,
  but it's not a real conflict.
  Upgraded `docker/build-push-action` as upstream did.
- `app/javascript/mastodon/features/compose/components/compose_form.js`:
  Upstream changed the codestyle near a line we had modified to accommodate
  configurable character count.
  Kept our change.
This commit is contained in:
Claire
2023-02-03 19:07:58 +01:00
parent ec26f7c1b1 79ca19e9b2
commit aeacebb3d7
249 changed files with 4854 additions and 3174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/mastodon/version.rb
View File

@ -17,7 +17,7 @@ module Mastodon
end
def flags
'rc2'
'rc3'
end
def suffix