]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'pro' of /var/git/teleforma into pro
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 12 Jun 2013 19:41:13 +0000 (21:41 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 12 Jun 2013 19:41:13 +0000 (21:41 +0200)
1  2 
teleforma/templates/teleforma/seminar_testimonial.html
teleforma/urls.py

Simple merge