Merge branch 'stream-debugger'
authorVitaliy.Bibaev <vitaliy.bibaev@jetbrains.com>
Fri, 6 Oct 2017 06:52:16 +0000 (09:52 +0300)
committerVitaliy.Bibaev <vitaliy.bibaev@jetbrains.com>
Fri, 6 Oct 2017 06:52:16 +0000 (09:52 +0300)
1  2 
.idea/modules.xml
build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy

Simple merge