]> git.parisson.com Git - teleforma.git/commit
Merge branch 'prodev' of /var/git/teleforma into prodev
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 9 Sep 2013 14:39:26 +0000 (16:39 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 9 Sep 2013 14:39:26 +0000 (16:39 +0200)
commit6b3a42db2e8429b48ba212c2d9e956860b3b520a
treef384a902ba7cbaad7aea811c245e786fa9ac2b22
parent451a0fda0e6a6c2fe88ecd96eef1dea0775588f1
parent6369a6065224a0552d725d734f22cda9fac11afb
Merge branch 'prodev' of /var/git/teleforma into prodev

Conflicts:
teleforma/templatetags/teleforma_tags.py
teleforma/templatetags/teleforma_tags.py