projects / idea / community.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12e6e50 1f8e056)
Merge remote-tracking branch 'origin/liana/edu-tests'
authorliana.bakradze <liana.bakradze@jetbrains.com>
Mon, 19 Sep 2016 13:04:48 +0000 (16:04 +0300)
committerliana.bakradze <liana.bakradze@jetbrains.com>
Mon, 19 Sep 2016 13:04:48 +0000 (16:04 +0300)
# Conflicts:
# python/educational-core/student/src/com/jetbrains/edu/learning/ui/CCCreateAnswerPlaceholderPanel.java


Trivial merge
IntelliJ IDEA Community Edition and IntelliJ Platform.