Merge remote-tracking branch 'origin/sdombrovsky/dmg_back_update'

author Stanislav Dombrovsky <stanislav.dombrovsky@jetbrains.com>

Fri, 26 Jan 2018 13:36:31 +0000 (16:36 +0300)

committer Stanislav Dombrovsky <stanislav.dombrovsky@jetbrains.com>

Fri, 26 Jan 2018 13:36:31 +0000 (16:36 +0300)
author Stanislav Dombrovsky <stanislav.dombrovsky@jetbrains.com>
Fri, 26 Jan 2018 13:36:31 +0000 (16:36 +0300)
committer Stanislav Dombrovsky <stanislav.dombrovsky@jetbrains.com>
Fri, 26 Jan 2018 13:36:31 +0000 (16:36 +0300)
diff --cc build/groovy/org/jetbrains/intellij/build/IdeaCommunityProperties.groovy
Simple merge
diff --cc python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.groovy
Simple merge
diff --cc python/educational-python/build/groovy/org/jetbrains/intellij/build/pycharm/edu/PyCharmEduProperties.groovy
Simple merge
author	Stanislav Dombrovsky <stanislav.dombrovsky@jetbrains.com>
	Fri, 26 Jan 2018 13:36:31 +0000 (16:36 +0300)
committer	Stanislav Dombrovsky <stanislav.dombrovsky@jetbrains.com>
	Fri, 26 Jan 2018 13:36:31 +0000 (16:36 +0300)
		1	2
build/groovy/org/jetbrains/intellij/build/IdeaCommunityProperties.groovy	patch \|	diff1 \|	diff2 \|	blob \| history
python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.groovy	patch \|	diff1 \|	diff2 \|	blob \| history
python/educational-python/build/groovy/org/jetbrains/intellij/build/pycharm/edu/PyCharmEduProperties.groovy	patch \|	diff1 \|	diff2 \|	blob \| history