nyastodon/app
Claire dfc05ec8df Merge commit '6273416292090b2f6bfda33f070cea325a1759df' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-nightly.yml`:
  Upstream modified this file close to a line modified by glitch-soc to
  disable the ARMv64 builder (as glitch-soc doesn't have one).
  Ported upstream's changes.
- `.github/workflows/build-releases.yml`:
  Upstream modified this file close to lines changed by glitch-soc to
  change the Docker image repositories used (only ghcr, and based on the
  organization's name).
  Ported upstream's changes.
2023-09-15 21:43:49 +02:00
..
chewy Fix #hashtag matching non-hashtagged posts in search (#26781) 2023-09-04 10:18:45 +02:00
controllers Merge commit 'b90383d07388fe8513e59a6deb1a2391146c6561' into glitch-soc/merge-upstream 2023-09-15 21:39:21 +02:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2023-09-05 20:34:17 +02:00
javascript Merge commit '6273416292090b2f6bfda33f070cea325a1759df' into glitch-soc/merge-upstream 2023-09-15 21:43:49 +02:00
lib Merge commit '6273416292090b2f6bfda33f070cea325a1759df' into glitch-soc/merge-upstream 2023-09-15 21:43:49 +02:00
mailers Add admin notifications for new Mastodon versions (#26582) 2023-09-01 17:47:07 +02:00
models Merge commit '6273416292090b2f6bfda33f070cea325a1759df' into glitch-soc/merge-upstream 2023-09-15 21:43:49 +02:00
policies Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' into glitch-soc/merge-upstream 2023-09-15 20:57:40 +02:00
presenters Add admin notifications for new Mastodon versions (#26582) 2023-09-01 17:47:07 +02:00
serializers Merge commit 'b90383d07388fe8513e59a6deb1a2391146c6561' into glitch-soc/merge-upstream 2023-09-15 21:39:21 +02:00
services Merge commit '6273416292090b2f6bfda33f070cea325a1759df' into glitch-soc/merge-upstream 2023-09-15 21:43:49 +02:00
validators Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream 2023-08-11 22:15:41 +02:00
views Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' into glitch-soc/merge-upstream 2023-09-15 20:57:40 +02:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2023-09-05 20:34:17 +02:00