]> git.parisson.com Git - teleforma.git/commitdiff
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)
Conflicts:
teleforma/views/core.py

1  2 
teleforma/models/core.py
teleforma/views/core.py

Simple merge
Simple merge