fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-30 08:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/.github
History
Claire fe5f6bc7ed Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-image.yml`:
  Fix erroneous deletion in a previous merge.
- `Gemfile`:
  Conflict caused by glitch-soc-only hCaptcha dependency
- `app/controllers/auth/sessions_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
- `app/controllers/filters_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
- `app/serializers/rest/status_serializer.rb`:
  Minor conflict due to glitch-soc having an extra `local_only` property
2022-06-28 11:11:18 +02:00
..
ISSUE_TEMPLATE Remove references to discourse.joinmastodon.org (#17797) 2022-03-15 08:13:22 +01:00
workflows Merge branch 'main' into glitch-soc/merge-upstream 2022-06-28 11:11:18 +02:00
FUNDING.yml Remove references to discourse.joinmastodon.org (#17797) 2022-03-15 08:13:22 +01:00
stale.yml Change stale bot to only touch pull requests over 120 days old (#12217) 2019-10-26 12:45:52 +02:00
stylelint-matcher.json Set-up Problem Matchers (#18598) 2022-06-16 22:09:43 +02:00