Merge remote-tracking branch 'origin/master' into fix-python-linting

Conflicts:
	plugins/c9.ide.language.python/worker/python_completer.js
pull/248/head
Lennart Kats 2016-01-23 14:56:42 +00:00
commit 5c18f27545
1 zmienionych plików z 8 dodań i 8 usunięć

Wyświetl plik

@ -1,7 +1,7 @@
{
"name": "c9",
"description": "New Cloud9 Client",
"version": "3.1.1159",
"version": "3.1.1163",
"author": "Ajax.org B.V. <info@ajax.org>",
"private": true,
"main": "bin/c9",
@ -56,16 +56,16 @@
"c9"
],
"c9plugins": {
"c9.ide.language": "#ee9c45925a",
"c9.ide.language": "#cec7cac3b1",
"c9.ide.language.css": "#be07d72209",
"c9.ide.language.generic": "#847eb66a89",
"c9.ide.language.generic": "#9d6f268f8d",
"c9.ide.language.html": "#9be847c0ce",
"c9.ide.language.html.diff": "#24f3608d26",
"c9.ide.language.javascript": "#07fd057023",
"c9.ide.language.javascript": "#a2f2b8434d",
"c9.ide.language.javascript.immediate": "#c8b1e5767a",
"c9.ide.language.javascript.eslint": "#3127e1eba1",
"c9.ide.language.javascript.tern": "#45e5f5b0e5",
"c9.ide.language.javascript.infer": "#8b9cf15328",
"c9.ide.language.javascript.infer": "#8664d42920",
"c9.ide.language.jsonalyzer": "#243e11bd42",
"c9.ide.collab": "#e2411fc12b",
"c9.ide.local": "#a6e689e33b",
@ -91,8 +91,8 @@
"c9.ide.imgeditor": "#612e75ef4f",
"c9.ide.immediate": "#a962119bec",
"c9.ide.installer": "#0fde9f0067",
"c9.ide.language.python": "#fa50044c7c",
"c9.ide.language.go": "#3d81cc4a70",
"c9.ide.language.python": "#55af15aeb9",
"c9.ide.language.go": "#5952a39226",
"c9.ide.mount": "#86c8985f34",
"c9.ide.navigate": "#1fbb7cd53b",
"c9.ide.newresource": "#981a408a7b",
@ -108,7 +108,7 @@
"c9.ide.run": "#f03e4b018e",
"c9.ide.run.build": "#0598fff697",
"c9.ide.run.debug.xdebug": "#a1b39e0ac4",
"c9.ide.save": "#83d759562a",
"c9.ide.save": "#29fce5e9b6",
"c9.ide.scm": "#ca3c94b84f",
"c9.ide.terminal.monitor": "#a0d1f02991",
"c9.ide.test": "#a282ec1619",