]> git.parisson.com Git - teleforma.git/commit
Merge branch 'dev' of /var/git/teleforma into ae
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 7 Nov 2012 11:29:09 +0000 (12:29 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 7 Nov 2012 11:29:09 +0000 (12:29 +0100)
commit473cc0a9bfb2c1ab6b1462e49da51ad31d780902
treece34cf7f49db614ebc4a7dbb44dad2885be77966
parentebbcb4da2c7ba3a088ecbc3f872b65aa1303c26c
parentfb489c579cd3dc55ee266dd8c93e801f14d9a4b5
Merge branch 'dev' of /var/git/teleforma into ae
teleforma/templates/teleforma/course_media.html