Merge branch 'traff/open_or_attach'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 1 Oct 2018 15:58:47 +0000 (17:58 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 1 Oct 2018 15:58:47 +0000 (17:58 +0200)
1  2 
platform/platform-api/src/com/intellij/ide/GeneralSettings.java
platform/platform-impl/src/com/intellij/platform/PlatformProjectOpenProcessor.java
platform/platform-resources-en/src/messages/IdeBundle.properties