IDEA-268850 [merge-android-42] merge fresh IJ master
authorAndrei Kuznetsov <andrei.kuznetsov@jetbrains.com>
Sat, 29 May 2021 17:14:54 +0000 (20:14 +0300)
committerintellij-monorepo-bot <intellij-monorepo-bot-no-reply@jetbrains.com>
Sat, 29 May 2021 17:14:54 +0000 (17:14 +0000)
GitOrigin-RevId: 82dc3097254245138205c0261d80302c9248dbf4

1  2 
.idea/modules.xml
intellij.idea.community.main.iml
platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy

Simple merge
Simple merge