Merge branch 'master' into osx-fix-tab-for-iterm
Conflicts: plugins/osx/osx.plugin.zsh
plugins/emoji/README.md
0 → 100644
plugins/emoji/emoji-data.txt
0 → 100644
Please register or sign in to comment
Conflicts: plugins/osx/osx.plugin.zsh