Merge branch 'codedmart-patch-2'

This commit is contained in:
Dan Burton 2016-09-30 18:55:19 -07:00
commit c2539da349
No known key found for this signature in database
GPG Key ID: C11E00118F0CE509

View File

@ -1743,9 +1743,8 @@ packages:
- storable-record
"Brandon Martin <brandon@codedmart.com> @codedmart":
[]
# GHC 8 & via engine-io - engine-io-wai
# - rethinkdb # BLOCKED aeson 1.0
- rethinkdb
"Michael Walker <mike@barrucadu.co.uk> @barrucadu":
- both