Merge pull request gjtorikian#93 from jch/bump-1.1.0

jch · jch · commit 6bb88c60cc51 · 2013-11-20T10:31:28.000-08:00
Bump version 1.1.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,14 +1,18 @@
 # CHANGELOG
 
+## 1.1.0
+
+  * escape emoji filenames in urls #92 jayroh
+
 ## 1.0.0
 
 To upgrade to this release, you will need to include separate gems for each of
 the filters. See [this section of the README](/README.md#dependencies) for
 details.
 
-* filter dependencies are no longer included #80 from simeonwillbanks/simple-dependency-management
-* Add link_attr option to Autolink filter #89 from excid3/master
-* Add ActiveSupport back in as dependency for xml-mini #85 from mojavelinux/xml-mini
+  * filter dependencies are no longer included #80 from simeonwillbanks/simple-dependency-management
+  * Add link_attr option to Autolink filter #89 from excid3/master
+  * Add ActiveSupport back in as dependency for xml-mini #85 from mojavelinux/xml-mini
 
 ## 0.3.1
 
diff --git a/lib/html/pipeline/version.rb b/lib/html/pipeline/version.rb
@@ -1,5 +1,5 @@
 module HTML
   class Pipeline
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end
