Merge remote-tracking branch 'origin/github/pr/55'
authorMichael Prokop <mika@grml.org>
Fri, 25 May 2018 09:12:40 +0000 (11:12 +0200)
committerMichael Prokop <mika@grml.org>
Fri, 25 May 2018 09:12:40 +0000 (11:12 +0200)
1  2 
etc/zsh/zshrc

diff --cc etc/zsh/zshrc
Simple merge