Merge branch 'master' of https://github.com/jch/html-pipeline

josh · josh · commit e62b1f6da73d · 2014-01-08T17:25:28.000-08:00
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
