Merge branch '1.5'

Author: weavejester

HISTORY.md

@@ -8,6 +8,10 @@
 * Updated Ring dependency to 1.6.0-beta4
 * Added support for asynchronous handlers
 
+## 1.5.2 (2017-01-10)
+
+* Updated Ring dependency to 1.5.1 to fix path traversal vulnerability
+
 ## 1.5.1 (2016-06-19)
 
 * Fixed coercions for functions that return false (see #150)

README.md

@@ -9,7 +9,7 @@ applications to be composed of small, independent parts.
 
 Add the following dependency to your `project.clj` file:
 
-    [compojure "1.5.1"]
+    [compojure "1.5.2"]
 
 ## Documentation