Merge branch 'master' into warnings-and-logo

Conflicts: yammat.cabal
2016-01-21 22:33:57 +01:00 · 2016-01-21 22:33:57 +01:00 · a31e397005
commit a31e397005
parent 926a8b5bd8 fe2efc19e3
2 changed files with 1 additions and 1 deletions
--- a/static/images/de-min.svg
+++ b/static/images/de-min.svg
--- a/yammat.cabal
+++ b/yammat.cabal
@ -90,7 +90,7 @@ library
                 , aeson                         >= 0.6        && < 0.11
                 , conduit                       >= 1.0        && < 2.0
                 , monad-logger                  >= 0.3        && < 0.4
-                 , fast-logger                   >= 2.2
+                 , fast-logger                   >= 2.2        && < 2.5
                 , wai-logger                    >= 2.2        && < 2.3
                 , file-embed
                 , safe