Merge branch 'release/0.12.1'

miracle2k · Jan 8, 2017 · f7e3536 · f7e3536
2 parents f11f7d3 + 06161e4
commit f7e3536
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,10 @@
+0.12.1 (2017-01-08)
+    - Fix compatibility with Jinja 2.9.
+    - When globbing, include files in alphabetical order (Sam Douglas).
+    - Remove duplicate files from bundles (Sam Douglas).
+    - Support for PyInstaller (Ilya Kreymer).
+    - Fix the sass filter (Dan Callaghan).
+
 0.12 (2016-08-18)
     - Babel filter (JDeuce).
     - NodeSASS filter (Luke Benstead).

diff --git a/src/webassets/__init__.py b/src/webassets/__init__.py
@@ -1,4 +1,4 @@
-__version__ = (0, 12, 0)
+__version__ = (0, 12, 1)
 
 
 # Make a couple frequently used things available right here.