Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request rust-lang#1039 from ehuss/fix-html-config
Fix merge conflict.
- Loading branch information