Merge branch 'master' into behrangsa-fish-config
authorBehrang <18451+behrangsa@users.noreply.github.com>
Sat, 23 Jun 2018 14:14:51 +0000 (00:14 +1000)
committerGitHub <noreply@github.com>
Sat, 23 Jun 2018 14:14:51 +0000 (00:14 +1000)
commit123c4f380e78f03a639cc8729ceb14da552bacc0
tree5cf18ec09410fd8cebe6a30333a191395c01a2be
parent6b2fa485c4116b9a00774d7b0d4f1673e9606508
parent9027c9e2e8405a1c89fef564478d3f27ec034419
Merge branch 'master' into behrangsa-fish-config
plugins/terminal/resources/fish/config.fish