Merge remote-tracking branch 'origin/master' into eldar/async-execution-coroutines
authorEldar Abusalimov <eldar.abusalimov@jetbrains.com>
Thu, 16 Aug 2018 01:46:38 +0000 (04:46 +0300)
committerEldar Abusalimov <eldar.abusalimov@jetbrains.com>
Thu, 16 Aug 2018 01:46:38 +0000 (04:46 +0300)
commit7ca6d4b0d426748b8600bbd7e47c6d504efdd022
treef11172b265c93f3ddebcb7d67a2a1523b2fbabd4
parent3516777c8248c2f8aeda7beda431da841f7d3d69
parent6021510e70a1b08d20648da74cfd555ea7beda58
Merge remote-tracking branch 'origin/master' into eldar/async-execution-coroutines

# Conflicts:
# platform/platform-impl/src/com/intellij/openapi/application/impl/AppUIExecutorImpl.java
platform/platform-impl/intellij.platform.ide.impl.iml