IDEA-268850 [merge-android-42] merge fresh IJ master

author Andrei Kuznetsov <andrei.kuznetsov@jetbrains.com>

Sat, 29 May 2021 17:14:54 +0000 (20:14 +0300)

committer intellij-monorepo-bot <intellij-monorepo-bot-no-reply@jetbrains.com>

Sat, 29 May 2021 17:14:54 +0000 (17:14 +0000)
author Andrei Kuznetsov <andrei.kuznetsov@jetbrains.com>
Sat, 29 May 2021 17:14:54 +0000 (20:14 +0300)
committer intellij-monorepo-bot <intellij-monorepo-bot-no-reply@jetbrains.com>
Sat, 29 May 2021 17:14:54 +0000 (17:14 +0000)
diff --cc .idea/modules.xml
Simple merge
diff --cc intellij.idea.community.main.iml
Simple merge
diff --cc platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
Simple merge
diff --cc platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy
Simple merge
author	Andrei Kuznetsov <andrei.kuznetsov@jetbrains.com>
	Sat, 29 May 2021 17:14:54 +0000 (20:14 +0300)
committer	intellij-monorepo-bot <intellij-monorepo-bot-no-reply@jetbrains.com>
	Sat, 29 May 2021 17:14:54 +0000 (17:14 +0000)
		1	2
.idea/modules.xml	patch \|	diff1 \|	diff2 \|	blob \| history
intellij.idea.community.main.iml	patch \|	diff1 \|	diff2 \|	blob \| history
platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy	patch \|	diff1 \|	diff2 \|	blob \| history
platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy	patch \|	diff1 \|	diff2 \|	blob \| history