Browse files

Merge branch 'develop' of https://github.com/emperorcezar/django_comp…

…ressor into emperorcezar-develop

Conflicts:
	docs/settings.txt
  • Loading branch information...
2 parents 434bc5e + adb1c03 commit 6430e74fb17ab02a4a34a2db42036ff5804bc785 @jezdez jezdez committed Jan 30, 2012
Showing with 8 additions and 2 deletions.
  1. +8 −2 docs/settings.txt
View
10 docs/settings.txt
@@ -234,6 +234,12 @@ Backend settings
('text/x-scss', 'sass --scss {infile} {outfile}'),
)
+ .. note::
+ The lessc compiler will have different parameters if installed
+ with Ruby Gems and not npm_.
+
+ _npm: http://lesscss.org/#-server-side-usage
+
With that setting (and CoffeeScript_ installed), you could add the following
code to your templates:
@@ -423,5 +429,5 @@ Offline settings
:Default: ``manifest.json``
- The name of the file to be used for saving the names of the files compressed
- offline.
+ The name of the file to be used for saving the names of the files
+ compressed offline.

0 comments on commit 6430e74

Please sign in to comment.