Merge branch 'master' into feature/ripgrep

2017-02-22 17:15:59 -08:00
parent 09c773df21 5e30685db8
commit a3c7492f82
4 changed files with 9 additions and 6 deletions
--- a/vim/vundles/languages.vundle
+++ b/vim/vundles/languages.vundle
@@ -5,3 +5,5 @@ Bundle 'jtratner/vim-flavored-markdown.git'
 Bundle 'scrooloose/syntastic.git'
 Bundle 'nelstrom/vim-markdown-preview'
 Bundle 'skwp/vim-html-escape'
+Bundle 'mxw/vim-jsx'
+Bundle 'jparise/vim-graphql'
--- a/vim/vundles/project.vundle
+++ b/vim/vundles/project.vundle
@@ -2,5 +2,6 @@ Bundle "jistr/vim-nerdtree-tabs.git"
 Bundle "scrooloose/nerdtree.git"
 Bundle "ctrlpvim/ctrlp.vim"
 Bundle 'JazzCore/ctrlp-cmatcher'
+Bundle 'junegunn/fzf'
 Bundle "xolox/vim-misc"
 Bundle "xolox/vim-session"