fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-26 02:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/.github/workflows
History
Claire f224237862 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `db/schema.rb`:
  Conflict due to glitch-soc adding the `content_type` column on status edits
  and thus having a different schema version number.
  Solved by taking upstream's schema version number, as it is higher than
  glitch-soc's.
2022-02-17 10:58:44 +01:00
..
build-image.yml Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
check-i18n.yml Remove protobuf dependencies (#17539) 2022-02-14 16:08:02 +01:00