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
..
has_settings.rb	Merge branch 'refs/heads/glitch-soc' into develop	2024-04-11 21:50:48 +02:00
ldap_authenticable.rb	Ignore legacy moderator and admin columns on User model (#29188)	2024-02-13 20:03:00 +01:00
omniauthable.rb	Merge pull request from GHSA-vm39-j3vx-pch3	2024-02-14 15:25:15 +01:00
pam_authenticable.rb	Ignore legacy moderator and admin columns on User model (#29188)	2024-02-13 20:03:00 +01:00