Merge branch 'master' into vplyashkun/clang_tidy_multifile_fixes
authorVladimir Plyashkun <vladimir.plyashkun@jetbrains.com>
Tue, 11 Sep 2018 13:03:22 +0000 (16:03 +0300)
committerVladimir Plyashkun <vladimir.plyashkun@jetbrains.com>
Tue, 11 Sep 2018 13:03:22 +0000 (16:03 +0300)
# Conflicts:
# platform/analysis-impl/src/com/intellij/codeInspection/ExternalAnnotatorInspectionVisitor.java

1  2 
platform/analysis-impl/src/com/intellij/codeInspection/ExternalAnnotatorInspectionVisitor.java