Merge branch 'master' of https://github.com/haskell/filepath
authorNeil Mitchell <ndmitchell@gmail.com>
Mon, 21 May 2018 18:25:55 +0000 (19:25 +0100)
committerNeil Mitchell <ndmitchell@gmail.com>
Mon, 21 May 2018 18:25:55 +0000 (19:25 +0100)
1  2 
filepath.cabal

diff --cc filepath.cabal
Simple merge