]> git.parisson.com Git - teleforma.git/commit
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)
commitd9501a6efd449a5fb3c3c9cd26018e5850b262a2
treead0def70acd4b8cdfe230d1c535abacf0c2ae95d
parentd95a9f2c2991b63f56ff847f08dd7887126472e3
parent54e4b17b2d48ffda58595b53edd26bd764c5f657
Merge branch 'prodev' of /var/git/teleforma into prodev

Conflicts:
teleforma/pages/fr/help.rst
teleforma/templatetags/teleforma_tags.py
teleforma/views/core.py