Merge
authorBryan O'Sullivan <bos@serpentine.com>
Tue, 27 Jun 2017 00:23:41 +0000 (01:23 +0100)
committerBryan O'Sullivan <bos@serpentine.com>
Tue, 27 Jun 2017 00:23:41 +0000 (01:23 +0100)
1  2 
tests/Tests/Properties.hs

Simple merge