mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-12-13 05:39:03 +01:00
1d1c3a808a
Conflicts: - `app/models/user_settings.rb`: Upstream removed a setting textually adjacent to a glitch-soc-only setting. Removed the setting glitch-soc removed. |
||
---|---|---|
.. | ||
has_settings.rb | ||
ldap_authenticable.rb | ||
omniauthable.rb | ||
pam_authenticable.rb |