Jeremy Kescher 2df3b9f803 Merge branch 'refs/heads/glitch-soc' into develop ... # Conflicts: # app/serializers/initial_state_serializer.rb		2024-04-11 21:50:48 +02:00
..
appearance	Merge branch 'refs/heads/glitch-soc' into develop	2024-04-11 21:50:48 +02:00
notifications	Merge branch 'glitch-soc' into develop	2024-03-14 20:01:30 +01:00
other	Fix lint issue in glitch-soc-only setting form	2024-01-11 13:22:39 +01:00