]> git.parisson.com Git - teleforma.git/commit
Merge branch 'crfpa' into tc202
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 22 Jul 2013 12:18:39 +0000 (14:18 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 22 Jul 2013 12:18:39 +0000 (14:18 +0200)
commit8ed52325cdaa22ddfca939317770320f67ecbfa9
treead3e4d5e92848d9b667237ac69694d51e793ac7c
parent8f5879e7a34b2e6de640b63bdb917c1996b3194d
parenta5e6f9d9b69d39b5d5120535cde45210735dcea4
Merge branch 'crfpa' into tc202

Conflicts:
teleforma/views/core.py
teleforma/views/core.py