mirror of
https://github.com/funamitech/mastodon
synced 2024-11-23 22:57:05 +09: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. |
||
|---|---|---|
| .. | ||
| account_relationships_presenter_spec.rb | ||
| export_summary_spec.rb | ||
| familiar_followers_presenter_spec.rb | ||
| instance_presenter_spec.rb | ||
| status_relationships_presenter_spec.rb | ||