Merge branch 'da/dumb_run'
authorDmitry Avdeev <dmitry.avdeev@jetbrains.com>
Wed, 23 Aug 2017 15:52:55 +0000 (18:52 +0300)
committerDmitry Avdeev <dmitry.avdeev@jetbrains.com>
Wed, 23 Aug 2017 15:52:55 +0000 (18:52 +0300)
commit9d7f0314aaa8cc03626047f63c608ad77876b1ad
tree80c12fd8a4366664cada4c419776c12949853636
parent7aed4230c215d43cb7504f445e848f14abe2adec
parente0eae38dd9fd6aa2fcf2c50ff53e72b15555acba
Merge branch 'da/dumb_run'

# Conflicts:
# platform/lang-api/src/com/intellij/execution/configurations/ConfigurationType.java
platform/lang-api/src/com/intellij/execution/configurations/ConfigurationType.java
xml/impl/src/com/intellij/codeInsight/completion/XmlTagInsertHandler.java