bump version

docs/changelog.rst

@@ -2,6 +2,13 @@ Changelog
 =========
 
 
+1.2.6
+-----
+
+* New lines in templates are now escaper rather than deleted. Thanks to Trey Smith for the report and the patch.
+* Improve how we find where to write compiled file. Thanks to sirex for the patch.
+
+
 1.2.5
 -----
 

docs/conf.py

@@ -49,9 +49,9 @@ copyright = u'2011-2012, Timothée Peignier'
 # built documents.
 #
 # The short X.Y version.
-version = '1.2.5'
+version = '1.2.6'
 # The full version, including alpha/beta/rc tags.
-release = '1.2.5'
+release = '1.2.6'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='django-pipeline',
-    version='1.2.5',
+    version='1.2.6',
     description='Pipeline is an asset packaging library for Django.',
     long_description="""Pipeline is an asset packaging library for Django, providing
 both CSS and JavaScript concatenation and compression, built-in JavaScript