Claire 016d194274 Merge commit '2fe1b8d1695d8faa452a69872fde94ccc4611576' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/application_helper.rb`: Not a real conflict, upstream added helpers right next to glitch-soc only helpers. Added upstream's helpers. - `spec/models/status_spec.rb`: Not a real conflict, upstream added specs right next to glitch-soc only specs. Added upstream's tests.		2024-05-06 17:53:51 +02:00
..
about	Fix haml-lint LineLength cops in app/views/admin (#28680)	2024-03-15 11:19:00 +00:00
appearance	Merge commit 'f445d33fd6aa492df319f4cc4efbd255d7a84f0e' into glitch-soc/merge-upstream	2024-03-15 12:43:59 +01:00
branding	Allow admins to configure instance favicon and logo (#30040)	2024-05-06 15:06:52 +00:00
content_retention	Reword and rearrange Content Retention page (#27733)	2024-04-26 15:17:41 +00:00
discovery	Merge commit 'f445d33fd6aa492df319f4cc4efbd255d7a84f0e' into glitch-soc/merge-upstream	2024-03-15 12:43:59 +01:00
other	Add back missing glitch-soc admin settings (#1919)	2022-11-12 13:24:53 +01:00
registrations	Fix haml-lint LineLength cops in app/views/admin (#28680)	2024-03-15 11:19:00 +00:00
shared	Merge commit '3f6887557b23d363e7f8f18518db4447739d64bb' into glitch-soc/merge-upstream	2024-05-04 14:59:00 +02:00