Merge branch '1.1.x'

calmjs · Aug 7, 2018 · 0fa0129 · 0fa0129
2 parents 4625ba0 + f6b0df2
commit 0fa0129
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -91,4 +91,5 @@ branches:
     - testing
     - master
     - 1.0.x
+    - 1.1.x
     - 2.0.x
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,7 +1,7 @@
 Changelog
 =========
 
-1.1.0 - Unreleased
+1.1.0 - 2018-08-07
 ------------------
 
 - Correct the implementation of line continuation in strings.  This also