Merge branch 'daniil/ast-loading-filter-2'
authorDaniil Ovchinnikov <daniil.ovchinnikov@jetbrains.com>
Sat, 31 Mar 2018 12:47:27 +0000 (14:47 +0200)
committerDaniil Ovchinnikov <daniil.ovchinnikov@jetbrains.com>
Sat, 31 Mar 2018 12:47:27 +0000 (14:47 +0200)
commitb537ed23a9c5d7f8643dc7dbcea948334ad9a4c6
tree90cabf87b3dd0c82bf80bab7c2e137e03784f6a4
parent65ae957c67eaf2a1f9dc96cac70ae8648de99abf
parent1e5113d910f988ead1f097ebfe5c0932e9b3b7fd
Merge branch 'daniil/ast-loading-filter-2'

# Conflicts:
# platform/util/resources/misc/registry.properties
platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java
platform/util/resources/misc/registry.properties