]> git.parisson.com Git - teleforma.git/commit
Merge branch 'prodev' of /var/git/teleforma into prodev
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 12 Jun 2013 11:11:11 +0000 (13:11 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 12 Jun 2013 11:11:11 +0000 (13:11 +0200)
commitfb74d74b2b49c7d9f79fb78998a83365570b6149
tree19f16ceeb63e0fff2f0449069ca864309a6925b5
parent39ae8d496993e26ed4c89897a15adbb255b21e6d
parentcf73fe1e0679443b968f735e95a5e45cc45cbe02
Merge branch 'prodev' of /var/git/teleforma into prodev
teleforma/templatetags/teleforma_tags.py