Merge branch 'master' into warnings-and-logo

Conflicts:
	yammat.cabal
This commit is contained in:
Braden Walters 2016-01-21 22:33:57 +01:00
commit a31e397005
2 changed files with 1 additions and 1 deletions

0
static/images/de-min.svg Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 292 B

After

Width:  |  Height:  |  Size: 292 B

View file

@ -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