Merge pull request gjtorikian#97 from jch/bump-1.2.0

jch · jch · commit f6a7bbd743d9 · 2014-01-08T17:19:27.000-08:00
Bump version 1.2.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.2.0
+
+  * CamoFilter now camos https images. #96 josh
+
 ## 1.1.0
 
   * escape emoji filenames in urls #92 jayroh
diff --git a/lib/html/pipeline/version.rb b/lib/html/pipeline/version.rb
@@ -1,5 +1,5 @@
 module HTML
   class Pipeline
-    VERSION = "1.1.0"
+    VERSION = "1.2.0"
   end
 end
