]> git.parisson.com Git - teleforma.git/commit
Merge branch 'crfpa' into tc202
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 17 Sep 2013 16:38:08 +0000 (18:38 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 17 Sep 2013 16:38:08 +0000 (18:38 +0200)
commitcead587b425e3d24f101e78262b31c54416df04f
tree2795ba10ec43f17a3b8756efc78548e19b85db8e
parente560f76ca4219128710ae9c52d94eceefbb789d3
parentdd12ae7ae68fbe4c9af1a6bf70b1c3f4d331b0fe
Merge branch 'crfpa' into tc202

Conflicts:
teleforma/templates/teleforma/course_media.html
teleforma/models/core.py
teleforma/templates/teleforma/course_media.html
teleforma/views/core.py