Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Cancel update if the current user doesn't have write permissions for the oh-my-zsh directory.
Merge pull request #2358 from n-st/master

Cancel update if the current user doesn't have write permissions for the oh-my-zsh directory.
Revert "Cancel update if the current user doesn't have write permissions for the oh-my-zsh directory."

This reverts commit 152e1e07e0397ecc3f1778ea597d081c33ee8ff4.
Fix bad right prompt placing.
Update git.plugin.zsh
escape dashes
Merge pull request #2396 from soluwalana/master

Fix WIP false positive
Fixes tmuxinator plugin find on OSX
Merge pull request #2398 from phstc/fixes-tmuxinator-plugin-find

Fixes tmuxinator plugin `find` on OSX
Merge pull request #2389 from driver2000/patch-1

Fix bad right prompt placing.
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:codedsignal/oh-my-zsh