Merge branch 'master' into 0.3-beta

Conflicts: ring-core/project.clj ring-devel/project.clj ring-servlet/project.clj
mmcgrana · 5939be8f701cee8e85eabe9845bbeb6ce780ec64 · weavejester committed Sep 1, 2010 · Sep 1, 2010 · 5939be8
2 parents b6462c6 + 2a3548a
commit 5939be8f701cee8e85eabe9845bbeb6ce780ec64
Unified Split

Showing with 4 additions and 4 deletions.

+1 −1 ring-core/project.clj

+1 −1 ring-httpcore-adapter/project.clj

+1 −1 ring-jetty-adapter/project.clj

+1 −1 ring-servlet/project.clj
@@ -7,5 +7,5 @@
                  [commons-io "1.4"]
                  [commons-fileupload "1.2.1"]
                  [javax.servlet/servlet-api "2.5"]]
-  :dev-dependencies [[lein-clojars "0.5.0"]
+  :dev-dependencies [[lein-clojars "0.6.0"]
                      [swank-clojure "1.2.1"]])
@@ -4,4 +4,4 @@
   :dependencies [[ring/ring-core "0.2.5"]
                  [org.apache.httpcomponents/httpcore "4.0.1"]
                  [org.apache.httpcomponents/httpcore-nio "4.0.1"]]
-  :dev-dependencies [[lein-clojars "0.5.0"]])
+  :dev-dependencies [[lein-clojars "0.6.0"]])
@@ -5,4 +5,4 @@
                  [ring/ring-servlet "0.2.5"]
                  [org.mortbay.jetty/jetty "6.1.14"]
                  [org.mortbay.jetty/jetty-util "6.1.14"]]
-  :dev-dependencies [[lein-clojars "0.5.0"]])
+  :dev-dependencies [[lein-clojars "0.6.0"]])
@@ -3,5 +3,5 @@
   :url "http://github.com/mmcgrana/ring"
   :dependencies [[ring/ring-core "0.3.0-beta1"]
                  [javax.servlet/servlet-api "2.5"]]
-  :dev-dependencies [[lein-clojars "0.5.0"]
+  :dev-dependencies [[lein-clojars "0.6.0"]
                      [swank-clojure "1.2.1"]])