Merge branch 'ypankratyev/goto_testdata_fixes'
authorYaroslav Pankratyev <yaroslav.pankratyev@jetbrains.com>
Mon, 18 Sep 2017 04:09:20 +0000 (11:09 +0700)
committerYaroslav Pankratyev <yaroslav.pankratyev@jetbrains.com>
Mon, 18 Sep 2017 04:09:20 +0000 (11:09 +0700)
commita2710c6121e01526dbdf32e8bd476c320e410aff
treeae4d3031225dc01e82b216b55d96b0cefb296b56
parent94da438658bd2043413c147cc4ef81189b58e0f7
parentd1a954bd6c10db6d90e3c059ecfc9d76c3ee95fe
Merge branch 'ypankratyev/goto_testdata_fixes'
platform/testFramework/src/com/intellij/testFramework/fixtures/CodeInsightTestFixture.java
platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
platform/util/src/com/intellij/openapi/util/text/StringUtil.java
plugins/devkit/resources/META-INF/plugin.xml
plugins/devkit/resources/org/jetbrains/idea/devkit/DevKitBundle.properties