Claire 1ad91dece8 Merge commit '9d8dfeb5fbbc274482489a3ac9f22dd736da156c' into glitch-soc/merge-upstream ...

Conflicts:
- `app/javascript/packs/admin.jsx`:
  Changes applied to `app/javascript/core/admin.js` instead.

2024-02-24 15:35:56 +01:00

..

about

Consolidate inclusion of admin js pack link (#26628)

2023-08-24 09:56:23 +02:00

appearance

Fix HAML linting issue

2023-12-17 16:37:11 +01:00

branding

Consolidate inclusion of admin js pack link (#26628)

2023-08-24 09:56:23 +02:00

content_retention

Consolidate inclusion of admin js pack link (#26628)

2023-08-24 09:56:23 +02:00

discovery

Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream

2023-12-20 20:10:45 +01:00

other

Add back missing glitch-soc admin settings (#1919)

2022-11-12 13:24:53 +01:00

registrations

Change registrations to be disabled by default for new servers (#29280)

2024-02-22 13:28:19 +00:00

shared

Merge branch 'main' into glitch-soc/merge-upstream

2023-07-19 07:35:51 +02:00