Merge remote-tracking branch 'origin/docker/remote-run' appcode/162.723 clion/162.724
authorAlexander Koshevoy <Alexander.Koshevoy@jetbrains.com>
Thu, 2 Jun 2016 08:39:26 +0000 (11:39 +0300)
committerAlexander Koshevoy <Alexander.Koshevoy@jetbrains.com>
Thu, 2 Jun 2016 08:39:26 +0000 (11:39 +0300)
Conflicts:
platform/util/resources/misc/registry.properties

1  2 
platform/util/resources/misc/registry.properties

index 0899fc1ed87f9ee38db94bfd29dc110e51a1f31a,5e64411bcf6b033cc1dc8aac74e6162494030107..ccd34ff3ea7dd470d8baa681d7b48121f1367877
@@@ -760,3 -742,6 +760,6 @@@ ide.intellij.laf.win10.ui.description=E
  ide.http.server.response.actual.status=false
  ide.rest.api.requests.per.minute=30
  ide.built.in.web.server.activatable=false
 -NodeJS.Docker.description=Enables Node.JS remote execution with Docker (if Docker and Node.JS plugins are installed)
+ NodeJS.Docker=false
++NodeJS.Docker.description=Enables Node.JS remote execution with Docker (if Docker and Node.JS plugins are installed)