Merge branch 'master' of github.com:fpco/stackage
Conflicts:
build-constraints.yaml
commit2a0621d8c2ac6c4ec01dd19d468ef637254e572c
authorMichael Snoyman <michael@snoyman.com>
dateMon 11 May 2015, 12:45 (11 years ago)
parent9fcbee2c11dac8
build-constraints.yaml+1
@@ -183,6 +183,7 @@ packages:
183183 - hakyll
184184 - stylish-haskell
185185 - psqueues
186+ - websockets
186187
187188 "Antoine Latter":
188189 - byteorder