Merge branch '1.1.x'

calmjs · Jul 25, 2018 · b7dcc41 · b7dcc41
2 parents 6c69b56 + 8bf2001
commit b7dcc41
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -100,3 +100,4 @@ branches:
     - testing
     - master
     - 1.0.x
+    - 1.1.x
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,7 +1,7 @@
 Changelog
 =========
 
-1.1.0 (Unreleased)
+1.1.0 (2018-07-25)
 ------------------
 
 - Provide support of prefix-free loaders through a customized webpack