]> git.parisson.com Git - teleforma.git/commit
Merge branch 'crfpa' into tc202
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 22 Jul 2013 08:46:22 +0000 (10:46 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 22 Jul 2013 08:46:22 +0000 (10:46 +0200)
commit8f5879e7a34b2e6de640b63bdb917c1996b3194d
tree476673cbdbabc924d3f551ee88c7266c2dc98f4b
parentefb667c9e214ed4af48d096c59704b830dc729cf
parentb3d9dc74e6915c50c395374b647f8e1a01aa227c
Merge branch 'crfpa' into tc202

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