Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Simon Brooke 2019-01-19 16:43:39 +00:00
commit 33c0398138
16 changed files with 536 additions and 8 deletions

View file

@ -1,4 +1,4 @@
(defproject smeagol "1.0.1"
(defproject smeagol "1.0.2-SNAPSHOT"
:description "A simple Git-backed Wiki inspired by Gollum"
:url "https://github.com/simon-brooke/smeagol"
:license {:name "GNU General Public License,version 2.0 or (at your option) any later version"
@ -7,6 +7,7 @@
[clj-yaml "0.4.0"]
[com.cemerick/url "0.1.1"]
[com.fzakaria/slf4j-timbre "0.3.7"]
[com.stuartsierra/component "0.3.2"]
[com.taoensso/encore "2.92.0"]
[com.taoensso/timbre "4.10.0"]
[com.taoensso/tower "3.0.2" :exclusions [com.taoensso/encore]]
@ -26,6 +27,7 @@
[org.slf4j/log4j-over-slf4j "1.7.25"]
[org.slf4j/jul-to-slf4j "1.7.25"]
[org.slf4j/jcl-over-slf4j "1.7.25"]
[prismatic/schema "1.1.9"]
[prone "1.1.4"]
[ring/ring-anti-forgery "1.1.0"]
[ring-server "0.4.0"]