Conflicts: - `lib/sanitize_ext/sanitize_config.rb`: Upstream added `<s>` to the list of allowed tags, the conflict is because we have a different list of allowed tags. Added `<s>` like upstream did.  | 
			||
|---|---|---|
| .. | ||
| sanitize_config.rb | ||
				
					
						
							Conflicts: - `lib/sanitize_ext/sanitize_config.rb`: Upstream added `<s>` to the list of allowed tags, the conflict is because we have a different list of allowed tags. Added `<s>` like upstream did.  | 
			||
|---|---|---|
| .. | ||
| sanitize_config.rb | ||