haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into yesod-1.4

Browse Source
This commit is contained in:
Michael Snoyman 2014-06-05 15:13:15 +03:00
commit 4158353070
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yesod-core/yesod-core.cabal
View File

@ -1,5 +1,5 @@
name: yesod-core name: yesod-core
version: 1.2.15.1 version: 1.2.15.2
license: MIT license: MIT
license-file: LICENSE license-file: LICENSE
author: Michael Snoyman <michael@snoyman.com> author: Michael Snoyman <michael@snoyman.com>
@ -57,7 +57,7 @@ library
, fast-logger >= 0.2 , fast-logger >= 0.2
, wai-logger >= 0.2 , wai-logger >= 0.2
, monad-logger >= 0.3.1 && < 0.4 , monad-logger >= 0.3.1 && < 0.4
, conduit >= 0.5 , conduit >= 1.0.11
, resourcet >= 0.4.9 && < 1.2 , resourcet >= 0.4.9 && < 1.2
, lifted-base >= 0.1.2 , lifted-base >= 0.1.2
, attoparsec-conduit , attoparsec-conduit

2
yesod-form/yesod-form.cabal
View File

@ -1,5 +1,5 @@
name: yesod-form name: yesod-form
version: 1.3.9 version: 1.3.9.1
license: MIT license: MIT
license-file: LICENSE license-file: LICENSE
author: Michael Snoyman <michael@snoyman.com> author: Michael Snoyman <michael@snoyman.com>

2
yesod/Yesod/Default/Main.hs
View File

@ -77,7 +77,7 @@ defaultMainLog load getApp = do
} app } app
where where
shouldLog' = shouldLog' =
#if MIN_VERSION_wai(2,1,3) #if MIN_VERSION_warp(2,1,3)
Warp.defaultShouldDisplayException Warp.defaultShouldDisplayException
#else #else
const True const True

2
yesod/yesod.cabal
View File

@ -1,5 +1,5 @@
name: yesod name: yesod
version: 1.2.5.2 version: 1.2.5.3
license: MIT license: MIT
license-file: LICENSE license-file: LICENSE
author: Michael Snoyman <michael@snoyman.com> author: Michael Snoyman <michael@snoyman.com>