Merge pull request #12066 from jqqqqqqqqqq/master
authorHannu Nyman <hannu.nyman@iki.fi>
Sun, 3 May 2020 18:56:24 +0000 (21:56 +0300)
committerGitHub <noreply@github.com>
Sun, 3 May 2020 18:56:24 +0000 (21:56 +0300)
fish: update to 3.1.2


Trivial merge