liana.bakradze d1b44d3296 Merge remote-tracking branch 'origin/liana/edu-tests' ...

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

2016-09-19 16:04:48 +03:00

..

course-creator

Merge remote-tracking branch 'origin/liana/edu-tests'

2016-09-19 16:04:48 +03:00

gradle/wrapper

…

student

Merge remote-tracking branch 'origin/liana/edu-tests'

2016-09-19 16:04:48 +03:00

build.gradle

…

educational-core.iml

…

gradle.properties

…

gradlew

…

gradlew.bat

…

settings.gradle

…