Claire d7fcd70023 Merge commit '2016c5d912f400ae98ee03ce269112de2f9ec62d' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/cors.rb`: Upstream refactored this file, and glitch-soc had local changes. I could not find the rationale for the glitch-soc changes, so I used upstream's version.		2023-10-08 16:41:56 +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 commit '2016c5d912f400ae98ee03ce269112de2f9ec62d' into glitch-soc/merge-upstream	2023-10-08 16:41:56 +02:00
javascript	[Glitch] Fix retention dashboard not displaying correct month	2023-10-08 16:33:37 +02:00
lib	Merge commit '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream	2023-09-26 13:13:27 +02:00
mailers	Add admin notifications for new Mastodon versions (#26582)	2023-09-01 17:47:07 +02:00
models	Merge commit '2016c5d912f400ae98ee03ce269112de2f9ec62d' into glitch-soc/merge-upstream	2023-10-08 16:41:56 +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 '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream	2023-09-26 13:13:27 +02:00
services	Merge branch 'main' into glitch-soc/merge-upstream	2023-09-19 17:07:29 +02:00
validators	Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream	2023-08-11 22:15:41 +02:00
views	Merge commit '2016c5d912f400ae98ee03ce269112de2f9ec62d' into glitch-soc/merge-upstream	2023-10-08 16:41:56 +02:00
workers	Merge branch 'main' into glitch-soc/merge-upstream	2023-09-05 20:34:17 +02:00