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)
commitd1b44d32960cf7bf1a7cdd3678bacbe865c62112
tree161e19d2221defb371d9e2af54524998685a85ba
parent12e6e501fa8d069af8486f51ce1730d8dfdc5097
parent1f8e05676e29083dbaa5c0fc23084ede39b6e944
Merge remote-tracking branch 'origin/liana/edu-tests'

# Conflicts:
# python/educational-core/student/src/com/jetbrains/edu/learning/ui/CCCreateAnswerPlaceholderPanel.java