Merge branch 'develop'

arttuka · Sep 1, 2016 · fc2fb22 · fc2fb22
2 parents edb311a + 35024cb
commit fc2fb22
Show file tree

Hide file tree

Showing 34 changed files with 4,804 additions and 37,984 deletions.
diff --git a/mtg-pairings-server/project.clj b/mtg-pairings-server/project.clj
@@ -2,11 +2,11 @@
   :license {:name "MIT License"
             :url "http://www.opensource.org/licenses/mit-license.php"}
   :dependencies [[org.clojure/clojure "1.8.0"]
-                 [org.clojure/core.cache "0.6.4"]
+                 [org.clojure/core.cache "0.6.5"]
                  [ring "1.2.1"]
                  [ring/ring-core "1.4.0"]
                  [http-kit "2.1.18"]
-                 [org.clojure/tools.reader "1.0.0-alpha3"]
+                 [org.clojure/tools.reader "1.0.0-beta1"]
                  [clj-time "0.11.0"]
                  [korma "0.4.2"]
                  [org.postgresql/postgresql "9.4.1208"]

diff --git a/mtg-pairings-server/resources/public/css/bootstrap-theme.css b/mtg-pairings-server/resources/public/css/bootstrap-theme.css
diff --git a/mtg-pairings-server/resources/public/css/bootstrap-theme.css.map b/mtg-pairings-server/resources/public/css/bootstrap-theme.css.map