Merge branch 'release/v1.10' into develop

This commit is contained in:
Morgan Astra 2016-09-22 17:22:12 -07:00
commit 4cecb13de7

View File

@ -1,6 +1,7 @@
(defproject witch-house/pronouns "1.10.0-SNAPSHOT" (defproject witch-house/pronouns "1.10.0-SNAPSHOT"
:description "Pronoun.is is a website for personal pronoun usage examples" :description "Pronoun.is is a website for personal pronoun usage examples"
:url "http://pronoun.is" :url "http://pronoun.is"
:license "GNU Affero General Public License 3.0"
:dependencies [[org.clojure/clojure "1.6.0"] :dependencies [[org.clojure/clojure "1.6.0"]
[compojure "1.1.8"] [compojure "1.1.8"]
[ring/ring-jetty-adapter "1.2.2"] [ring/ring-jetty-adapter "1.2.2"]