mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-12-05 04:29:03 +01:00
bf153b384b
Conflicts: - `app/controllers/auth/confirmations_controller.rb`: Upstream refactored, changing lines textually close of glitch-soc-only lines pertaining to the theming system. Resolved the conflict. - `app/controllers/auth/passwords_controller.rb`: Upstream refactored, changing lines textually close of glitch-soc-only lines pertaining to the theming system. Resolved the conflict. - `app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb`: Upstream refactored, changing lines textually close of glitch-soc-only lines pertaining to the theming system. Resolved the conflict. |
||
---|---|---|
.. | ||
exports | ||
migration | ||
preferences | ||
two_factor_authentication | ||
aliases_controller.rb | ||
applications_controller.rb | ||
base_controller.rb | ||
deletes_controller.rb | ||
exports_controller.rb | ||
featured_tags_controller.rb | ||
flavours_controller.rb | ||
imports_controller.rb | ||
login_activities_controller.rb | ||
migrations_controller.rb | ||
pictures_controller.rb | ||
privacy_controller.rb | ||
profiles_controller.rb | ||
sessions_controller.rb | ||
two_factor_authentication_methods_controller.rb | ||
verifications_controller.rb |