Changed paths:
M django/utils/html.py
M docs/internals/deprecation.txt
M docs/ref/templates/builtins.txt
M docs/releases/1.7.txt
M tests/defaultfilters/tests.py
M tests/template_tests/tests.py
M tests/utils_tests/test_html.py
Changed paths:
M django/utils/html.py
M docs/internals/deprecation.txt
M docs/ref/templates/builtins.txt
M docs/releases/1.7.txt
M tests/defaultfilters/tests.py
M tests/template_tests/tests.py
M tests/utils_tests/test_html.py
Log Message:
-----------
Merge pull request #2382 from erikr/deprecate-fix-ampersands
Fixed #22130 -- Deprecated fix_ampersands and clean_html.