]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'prodev' of /var/git/teleforma into prodev
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 23 Apr 2013 13:43:19 +0000 (15:43 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 23 Apr 2013 13:43:19 +0000 (15:43 +0200)
Conflicts:
teleforma/pages/fr/help.rst

1  2 
teleforma/templatetags/teleforma_tags.py
teleforma/views/core.py

Simple merge