namekuji/chuckya
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
chuckya/app/views/admin/settings
History
Claire 60abcb3c4c Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `config/i18n-tasks.yml`:
  Upstream added new ignored strings, glitch-soc has extra ignored strings
  because of the theming system.
  Added upstream's changes.
2023-01-18 17:38:11 +01:00
..
about Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
appearance Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
branding Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
content_retention Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
discovery Merge branch 'main' into glitch-soc/merge-upstream 2023-01-18 17:38:11 +01:00
other Add back missing glitch-soc admin settings (#1919) 2022-11-12 13:24:53 +01:00
registrations Merge branch 'main' into glitch-soc/merge-upstream 2022-11-14 08:35:55 +01:00
shared Add back missing glitch-soc admin settings (#1919) 2022-11-12 13:24:53 +01:00