Files
openide/python/educational-python/Edu-Python
meanmail 4ebf948245 Merge remote-tracking branch 'origin/master' into meanmail/EDU-839
Conflicts:
	python/educational-core/src/com/jetbrains/edu/learning/EduPluginConfigurator.java
	python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/PyEduPluginConfigurator.java
2017-04-17 17:39:38 +07:00
..