liana.bakradze 64a2edbc55 Merge branch 'liana/edu' ...

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

2016-03-14 14:59:30 +03:00

..

com/jetbrains/python/edu

…

courses

…

icons/com/jetbrains/edu/learning

…

META-INF

Merge branch 'liana/edu'

2016-03-14 14:59:30 +03:00

python.js

Move language-specific code-mirror files from educational core plugin, provide them by StudyToolWindowConfigurator

2016-03-03 13:10:52 +03:00