Claire b0c76eaadd Merge commit '0ad66175bf59a34b03d9ab2347181548d07089ea' into glitch-soc/merge-upstream ...

Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
  Upstream changed one import, close to a glitch-soc-only import to handle
  different max character counts.
  Ported upstream's change.

2023-10-24 18:41:20 +02:00

..

chewy

Fix #hashtag matching non-hashtagged posts in search (#26781)

2023-09-04 10:18:45 +02:00

controllers

Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream

2023-10-19 19:14:04 +02:00

helpers

Merge commit '0ad66175bf59a34b03d9ab2347181548d07089ea' into glitch-soc/merge-upstream

2023-10-24 18:41:20 +02:00

javascript

Merge commit '0ad66175bf59a34b03d9ab2347181548d07089ea' into glitch-soc/merge-upstream

2023-10-24 18:41:20 +02:00

lib

Merge commit '0ad66175bf59a34b03d9ab2347181548d07089ea' into glitch-soc/merge-upstream

2023-10-24 18:41:20 +02:00

mailers

Add admin notifications for new Mastodon versions (#26582)

2023-09-01 17:47:07 +02:00

models

Merge commit '0ad66175bf59a34b03d9ab2347181548d07089ea' into glitch-soc/merge-upstream

2023-10-24 18:41:20 +02:00

policies

Merge commit '5a437edc7f22d5797e5af29d9b450a03eccec304' into glitch-soc/merge-upstream

2023-10-08 17:05:40 +02:00

presenters

Add admin notifications for new Mastodon versions (#26582)

2023-09-01 17:47:07 +02:00

serializers

Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream

2023-10-19 19:14:04 +02:00

services

Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream

2023-10-19 19:14:04 +02:00

validators

Merge commit '935d54124e80e9fe5365c724e5c8827a2b3ed5b3' into glitch-soc/merge-upstream

2023-10-17 21:42:49 +02:00

views

Merge commit '0ad66175bf59a34b03d9ab2347181548d07089ea' into glitch-soc/merge-upstream

2023-10-24 18:41:20 +02:00

workers

Merge commit '37bbd3c1064380a756b4e821655d7697105f99f5' into glitch-soc/merge-upstream

2023-10-08 17:10:39 +02:00