Stashed support for fish
Merge pull request #34 from fernandolopez/develop

Stashed support for fish