]> git.parisson.com Git - teleforma.git/commit
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)
commitc44c39317c45c93c66c05276ce45026e9529f6fd
tree125ad0d89bd31427aa5df8883421c55197de6ee8
parentdbff8d8e1b62a859b12aacacce11b75156922f59
parent473cc0a9bfb2c1ab6b1462e49da51ad31d780902
Merge branch 'ae' of git+ssh://vcs.parisson.com/var/git/teleforma into dev
teleforma/templates/teleforma/course_conference.html