Merge branch 'master' of github.com:c9/newclient into sdk-update-plugins

pull/124/head
Ruben Daniels 2015-08-05 14:59:50 +00:00
commit e31ff50df7
2 zmienionych plików z 2 dodań i 1 usunięć

1
.gitignore vendored
Wyświetl plik

@ -43,6 +43,7 @@ node_modules/kaefer/node_modules/
!node_modules/ui
!node_modules/react-bootstrap
!node_modules/oldclient
!node_modules/vargs
node_modules/oldclient/node_modules
node_modules/oldclient/plugins-server/c9.api.project/tmp*

Wyświetl plik

@ -63,7 +63,7 @@
"c9.ide.language.javascript": "#8479d0a9c1",
"c9.ide.language.javascript.immediate": "#0535804ada",
"c9.ide.language.javascript.eslint": "#9b2721c3d0",
"c9.ide.language.javascript.tern": "#a8f7ed0e30",
"c9.ide.language.javascript.tern": "#88ec419283",
"c9.ide.language.javascript.infer": "#cfec494a3c",
"c9.ide.language.jsonalyzer": "#ba3e0d298c",
"c9.ide.collab": "#b49eda3791",