]> git.parisson.com Git - teleforma.git/commit
Merge branch 'pro' of git+ssh://vcs.parisson.com/var/git/teleforma into pro
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 15 Apr 2015 08:35:23 +0000 (10:35 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 15 Apr 2015 08:35:23 +0000 (10:35 +0200)
commitab123a8a998ce88c547a184b409bb3201de46671
tree86687986af6ec9752b940558720d14eb65ec1d43
parent49c0a967813c93acef43496f595fffcf6417c5fa
parent5f6f1dec22cbb7d01f16a2abfa50b94ffbc3df46
Merge branch 'pro' of git+ssh://vcs.parisson.com/var/git/teleforma into pro

Conflicts:
teleforma/templates/teleforma/seminar_media_video.html
teleforma/templates/teleforma/seminar_media_video.html