Merge branch 'traff/prebuilt-stubs'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Fri, 8 Sep 2017 08:54:14 +0000 (11:54 +0300)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Fri, 8 Sep 2017 08:54:14 +0000 (11:54 +0300)
commit4399e77e0b6d8ddd3b8af42d9591b68ac3d82e7b
treec478bf2765beb0e0b37f36b0fef3e2206867ab73
parentf21a7069a4d9b08a72e95f13f08e06df8d7bcd83
parent6976967404aa5e991219a9bf24a32a847e04ae3d
Merge branch 'traff/prebuilt-stubs'

# Conflicts:
# platform/util/resources/misc/registry.properties
# python/tools/src/com/jetbrains/python/tools/Utils.kt
platform/platform-resources/src/META-INF/LangExtensionPoints.xml
platform/util/resources/misc/registry.properties
python/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java
python/tools/src/com/jetbrains/python/tools/Utils.kt