Merge branch 'master' into stable

This commit is contained in:
Simon Cruanes 2018-01-21 15:45:16 -06:00
commit 9aebd8b932

View file

@ -17,6 +17,9 @@ depopts: [
"base-unix" "base-unix"
"base-threads" "base-threads"
"qtest" { test } "qtest" { test }
"qcheck" { test }
"oUnit" { test }
"odoc" { doc }
] ]
conflicts: [ conflicts: [
"sequence" { < "0.5" } "sequence" { < "0.5" }