Merge branch 'develop' into fscheck_testing
authorvaron <varon@users.noreply.github.com>
Wed, 31 May 2017 12:08:32 +0000 (14:08 +0200)
committervaron <varon@users.noreply.github.com>
Wed, 31 May 2017 12:08:32 +0000 (14:08 +0200)
commit83e0175a9fc9a3bba38c67b639110527099908f6
tree86dd0b3666c5231d4a50f0397971fcc1d2f83f2f
parentde71367b4b48af67edf89a91ec12c8ec92847724
parentc697eaed7562890f902f52ad14e4dfdbc1051c48
Merge branch 'develop' into fscheck_testing

Conflicts:
paket.lock
paket.dependencies