Merge branch 'master' into nightly

This commit is contained in:
Jens Petersen 2017-05-01 01:13:32 +09:00
commit 583e30e6a9

View File

@ -3,9 +3,9 @@ ghc-major-version: "8.0"
packages:
"Jose Iborra <pepeiborra@gmail.com> @pepeiborra":
[]
#- clr-marshal
#- clr-host
#- clr-inline
# - clr-marshal
# - clr-host
# - clr-inline
"Joshua Koike <jkoike2013@gmail.com> @jano017":
- discord-hs