Jeremy Kescher 1c9291adcd Merge branch 'glitch-soc' into develop ... # Conflicts: # app/javascript/flavours/glitch/styles/components/accounts.scss # app/javascript/flavours/glitch/styles/components/status.scss		2024-02-14 18:02:38 +01:00
..
has_settings.rb	Add support for emoji reactions	2023-12-29 12:33:13 -06: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