]> git.parisson.com Git - teleforma.git/commit
Merge branch 'crfpa' into ae
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 9 Sep 2013 11:04:02 +0000 (13:04 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 9 Sep 2013 11:04:02 +0000 (13:04 +0200)
commitbc54241f68ad472e5f0380bbe5fbcd2be615d30b
treee16f792319fe7101af230290aef76de8d3fd5012
parent9630410405248465d937bb4ebc9e893fad30cbe7
parent266e16a369385a687ddcc6d2e94a78ed54e89a94
Merge branch 'crfpa' into ae

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