Merge branch 'master' into dev.jp

2017-03-27 12:10:04 -04:00 · 2017-03-27 12:10:04 -04:00 · db8bbcd8b5
commit db8bbcd8b5
parent 6b000ecfb4 de9f5bc4c9
2 changed files with 7 additions and 0 deletions
--- a/appveyor.yml
+++ b/appveyor.yml
@ -1,6 +1,9 @@
 build: off

 before_test:
+# http://help.appveyor.com/discussions/problems/6312-curl-command-not-found
+- set PATH=C:\Program Files\Git\mingw64\bin;%PATH%
+
 - curl -sS -ostack.zip -L --insecure http://www.stackage.org/stack/windows-i386
 - 7z x stack.zip stack.exe

--- a/yesod-core/ChangeLog.md
+++ b/yesod-core/ChangeLog.md
@ -3,6 +3,10 @@
 * Contexts can be included in generated TH instances. [1365](https://github.com/yesodweb/yesod/issues/1365)
 * Type variables can be included in routes.

+## 1.4.33
+
+* Adds curly brackets to route parser. [#1363](https://github.com/yesodweb/yesod/pull/1363)
+
 ## 1.4.32

 * Fix warnings