luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-25 22:57:11 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/views/admin/settings
History
Claire d8b0a732aa Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/simple_form.rb`:
  Upstream added a new simple_form component, where we had an extra one.
  Kept both components.
2023-06-10 16:22:14 +02:00
..
about Merge branch 'main' into glitch-soc/merge-upstream 2023-02-09 12:46:12 +01:00
appearance
branding
content_retention Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream 2023-06-10 16:22:14 +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 commit 'bec6a1cad4c509c53deb378c7ba984ba7e2de5a9' into glitch-soc/merge-upstream 2023-05-25 22:49:18 +02:00
shared Add back missing glitch-soc admin settings (#1919) 2022-11-12 13:24:53 +01:00