Resolve conflicts
[idea/community.git] / python / educational-core / student / src / com / jetbrains / edu / learning / courseFormat / Course.java
2016-05-18 Valentina KiryushkinaResolve conflicts
2016-05-11 Elizaveta ShashkovaMerge pull request #386 fix conflict
2016-05-06 Shaverdova ElenaMerge branch 'leneshka/template-projects'
2016-05-05 nikMerge branch 'patch-1' of https://github.com/ryenus...
2016-05-04 Max MedvedevMerge remote-tracking branch 'origin/master' into medve...
2016-04-29 Dmitry AvdeevMerge branch 'merge_android_2'
2016-04-28 Vasily RomanikhinMerge branch 'master' into vromanik/doxygen
2016-04-28 Vladislav.SorokaMerge branch 'master' of https://github.com/dmitry...
2016-04-27 Vasily PisarMerge branch 'master' into daywalker/cmake_editing
2016-04-26 Andrey VlasovskikhMerge remote-tracking branch 'fitermay/pysdk-patch'
2016-04-25 Vladimir KrivosheevMerge remote-tracking branch 'origin/master' into IDEA...
2016-04-23 liana.bakradzeMerge remote-tracking branch 'origin/liana/course-creat...
2016-04-07 Valentina KiryushkinaAdd initial support for stepic adaptive courses
2016-04-04 Aleksandr SamofalovMerge branches 'evagl/included-from' and 'master' of...
2016-04-04 Max MedvedevMerge remote-tracking branch 'origin/master' into medve...
2016-03-30 Vasily PisarMerge branch 'master' into daywalker/cmake_editing clion/146.1019 clion/146.1104 clion/146.960
2016-03-24 Daniil OvchinnikovMerge PR #312 (https://github.com/JetBrains/intellij...
2016-03-23 liana.bakradzeadd courseMode to distinguish study and course creator...
2016-03-16 Alexey UtkinMerge branch 'master' into uta/complete-statement
2016-03-15 Vassiliy.KudryashovMerge remote-tracking branch 'origin/master'
2016-03-14 liana.bakradzeMerge remote-tracking branch 'origin/master'
2016-03-14 liana.bakradzeMerge branch 'liana/edu'
2016-03-11 liana.bakradzeremove redundant plugin educational-core