mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-22 18:48:06 +01:00
b28ce2424c
Conflicts: - `app/helpers/application_helper.rb`: Upstream added a helper where glitch-soc had its own, not really a conflict. Added upstream's helper. - `lib/sanitize_ext/sanitize_config.rb`: Upstream renamed a constant that was used slightly differently in glitch-soc. Renamed it as upstream did. |
||
---|---|---|
.. | ||
migration | ||
preferences | ||
two_factor_authentication | ||
aliases_controller_spec.rb | ||
deletes_controller_spec.rb | ||
featured_tags_controller_spec.rb | ||
flavours_controller_spec.rb | ||
imports_controller_spec.rb | ||
login_activities_controller_spec.rb | ||
migrations_controller_spec.rb | ||
pictures_controller_spec.rb | ||
privacy_controller_spec.rb | ||
profiles_controller_spec.rb | ||
sessions_controller_spec.rb | ||
two_factor_authentication_methods_controller_spec.rb | ||
verifications_controller_spec.rb |