mirror of https://github.com/glitch-soc/mastodon
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. |
||
|---|---|---|
| .. | ||
| base_controller.rb | ||
| direct_controller.rb | ||
| home_controller.rb | ||
| link_controller.rb | ||
| list_controller.rb | ||
| public_controller.rb | ||
| tag_controller.rb | ||