Claire dfe851b476 Merge branch 'stable-4.3' into glitch-soc/backports-4.3 ... Conflicts: - `app/helpers/application_helper.rb`: Upstream added a helper where glitch-soc had its own, not really a conflict. Added upstream's helper.		2024-10-05 20:45:05 +02:00
..
admin.rb	Merge branch 'stable-4.3' into glitch-soc/backports-4.3	2024-10-05 20:45:05 +02:00
api.rb	…
settings.rb	…