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. |
||
|---|---|---|
| .. | ||
| bookmarks_spec.rb | ||
| favourited_by_accounts_spec.rb | ||
| favourites_spec.rb | ||
| histories_spec.rb | ||
| mutes_spec.rb | ||
| pins_spec.rb | ||
| reblogged_by_accounts_spec.rb | ||
| reblogs_spec.rb | ||
| sources_spec.rb | ||
| translations_spec.rb | ||