Merge branch '1.2.X'

Conflicts: docs/conf.py setup.py

Merge branch '1.2.X'
Conflicts: docs/conf.py setup.py
1e1df0c0 · Timothée Peignier · d84c82a9 · 05d44760 · 1e1df0c0 · 1e1df0c0
Commit 1e1df0c0 authored Jan 12, 2013 by Timothée Peignier
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

HISTORY.rst
+5 -1

docs/compressors.rst
+2 -2

No files found.
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -4,13 +4,17 @@ History
 =======


+1.1.24
+------
+
+* Fix yui/yuglify settings overriding each other. Thanks to Fábio Santos.
+
 1.1.23
 ------

 * Separate yuglify compressor from YUI compressor.
 * Improve HTML compression middleware.

-
 1.1.22
 ------


--- a/docs/compressors.rst
+++ b/docs/compressors.rst
@@ -33,14 +33,14 @@ To use it for your javascripts add this to your ``PIPELINE_JS_COMPRESSOR`` ::

  Additional arguments to use when compressing CSS.

-  Defaults to ``''``.
+  Defaults to ``'--terminal'``.

 ``PIPELINE_YUGLIFY_JS_ARGUMENTS``
 ---------------------------------

  Additional arguments to use when compressing JavaScript.

-  Defaults to ``''``.
+  Defaults to ``'--terminal'``.


 YUI Compressor compressor