]> git.parisson.com Git - teleforma.git/commit
Merge branch 'crfpa' into tc202
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 17 Jul 2013 17:12:38 +0000 (19:12 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 17 Jul 2013 17:12:38 +0000 (19:12 +0200)
commit3fc70b90db10e82fc19b29f3b91ce39953e4cca7
tree5775d6d28e0ca293bd272906d48189c6e0a17749
parent4a24960e821e3776ea5448130de0665bf2a74caa
parenteb61ba697bedb6d727acde81e9d6442f219784d3
Merge branch 'crfpa' into tc202

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