mirror of
https://github.com/funamitech/mastodon
synced 2024-12-13 22:29:07 +09:00
e61a7794f8
Conflicts: - `lib/sanitize_ext/sanitize_config.rb`: Conflict because glitch-soc has a different list of allowed tags. Added upstream's new allowed tags while keeping ours. - `spec/requests/api/v1/timelines/public_spec.rb`: Conflict because of glitch-soc's default settings. Updated accordingly. |
||
---|---|---|
.. | ||
exports | ||
migration | ||
preferences | ||
two_factor_authentication | ||
aliases_controller_spec.rb | ||
applications_controller_spec.rb | ||
deletes_controller_spec.rb | ||
exports_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 |