]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'ae' of git+ssh://vcs.parisson.com/var/git/teleforma into dev
authoryomguy <yomguy@parisson.com>
Wed, 7 Nov 2012 11:32:12 +0000 (12:32 +0100)
committeryomguy <yomguy@parisson.com>
Wed, 7 Nov 2012 11:32:12 +0000 (12:32 +0100)
1  2 
teleforma/templates/teleforma/course_conference.html