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

..

resources

Merge branch 'liana/edu'

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

src

Merge branch 'liana/edu'

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

student-python.iml

remove redundant plugin educational-core

2016-03-11 11:03:38 +03:00