Skip to content

D
django-pipeline
Commit 1e1df0c0 by Timothée Peignier
Options

Merge branch '1.2.X' 

Conflicts:
	docs/conf.py
	setup.py
parents d84c82a9 05d44760
Showing with 7 additions and 3 deletions
HISTORY.rst
...@@ -4,13 +4,17 @@ History ...@@ -4,13 +4,17 @@ History
======= =======
1.1.24
------
* Fix yui/yuglify settings overriding each other. Thanks to Fábio Santos.
1.1.23 1.1.23
------ ------
* Separate yuglify compressor from YUI compressor. * Separate yuglify compressor from YUI compressor.
* Improve HTML compression middleware. * Improve HTML compression middleware.
1.1.22 1.1.22
------ ------
......
docs/compressors.rst
...@@ -33,14 +33,14 @@ To use it for your javascripts add this to your ``PIPELINE_JS_COMPRESSOR`` :: ...@@ -33,14 +33,14 @@ To use it for your javascripts add this to your ``PIPELINE_JS_COMPRESSOR`` ::
Additional arguments to use when compressing CSS. Additional arguments to use when compressing CSS.
Defaults to ``''``. Defaults to ``'--terminal'``.
``PIPELINE_YUGLIFY_JS_ARGUMENTS`` ``PIPELINE_YUGLIFY_JS_ARGUMENTS``
--------------------------------- ---------------------------------
Additional arguments to use when compressing JavaScript. Additional arguments to use when compressing JavaScript.
Defaults to ``''``. Defaults to ``'--terminal'``.
YUI Compressor compressor YUI Compressor compressor
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment