ipri2013/opencollea — pull request #58 by aOberstar (2013-05-15 18:20:25+00:00)
Title: Mergal konflikte

Manjkajoč CourseResource v urls.py in resources.py