Merge remote-tracking branch 'upstream/2.3.0' into new-sync-master-to-2.3.0

This commit is contained in:
Paul Ebermann
2017-03-15 16:34:27 +01:00
2 changed files with 10 additions and 10 deletions

View File

@@ -1,8 +1,8 @@
resolver: lts-5.11
resolver: lts-8.5
extra-deps:
- servant-0.6
- servant-client-0.6
- servant-server-0.6
- http-api-data-0.2.2
- servant-0.9.1.1
- servant-client-0.9.1.1
- servant-server-0.9.1.1
- http-api-data-0.3.5
packages:
- '.'

View File

@@ -1,8 +1,8 @@
resolver: lts-5.11
resolver: lts-8.5
extra-deps:
- servant-0.6
- servant-client-0.6
- servant-server-0.6
- http-api-data-0.2.2
- servant-0.9.1.1
- servant-client-0.9.1.1
- servant-server-0.9.1.1
- http-api-data-0.3.5
packages:
- '.'