Resolve conflicts
[idea/community.git] / python / educational-python / resources / fileTemplates / internal /
2016-05-18 Valentina KiryushkinaResolve conflicts
2016-05-17 Dmitry BatkovichMerge remote-tracking branch 'origin/master'
2016-05-16 Valentina KiryushkinaFix problems with checking local courses after fixes...
2016-05-12 Vladimir KrivosheevMerge remote-tracking branch 'origin/master' into IDEA...
2016-05-11 Vladimir.OrlovMerge remote-tracking branch 'origin/master'
2016-05-11 Elizaveta ShashkovaMerge pull request #386 fix conflict
2016-05-11 Elizaveta ShashkovaMerge pull request #397
2016-05-10 Liana BakradzeEDU-605 Tests always pass
2016-05-04 Valentina KiryushkinaUse python console to display test output
2016-05-02 Valentina KiryushkinaChange failed message for check from samples
2016-05-02 Valentina KiryushkinaAdd tests from samples provided for step and show test...
2016-02-24 Alexander KoshevoyMerge remote-tracking branch 'origin/master' into akosh...
2016-02-09 Dmitry TrofimovMerge remote-tracking branch 'origin/master'
2016-02-05 Alexander KoshevoyMerge branch 'topic/docker_python'
2016-02-02 Anton MakeevMerge remote-tracking branch 'origin/master' into amake... appcode/144.3627 clion/144.3630
2016-02-02 peterMerge branch 'master' into dany/groovy-resolve
2016-01-29 Andrey VlasovskikhMerge remote-tracking branch 'origin/master' into vlan...
2016-01-27 Roman ShevchenkoMerge pull request #347 (https://github.com/JetBrains...
2016-01-26 Valentina KiryushkinaRename educational plugins and update plugin's description