mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-12-13 23:09:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
catstodon/app/views/admin/settings
History
Claire b8209c3b96 Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream reworked the CSP, we kept our version for now.
- `spec/requests/content_security_policy_spec.rb`:
  Upstream reworked the CSP, we kept our version for now.
2023-12-20 20:10:45 +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 Consolidate inclusion of admin js pack link (#26628) 2023-08-24 09:56:23 +02:00
shared Merge branch 'main' into glitch-soc/merge-upstream 2023-07-19 07:35:51 +02:00