]> git.parisson.com Git - teleforma.git/commit
Merge branch 'crfpa' of git+ssh://vcs.parisson.com/var/git/teleforma into crfpa
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 19 Nov 2013 15:05:39 +0000 (16:05 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 19 Nov 2013 15:05:39 +0000 (16:05 +0100)
commitfb994124c9f226290f01a2f3e73fdea591239558
tree8b62dd85d295ce8fe83bfa0677678358b1572307
parentd867949e662c34d512a865b7c78990efeed1e18d
parentb6145f26fefc9ce451a84bd94df649593a9b825a
Merge branch 'crfpa' of git+ssh://vcs.parisson.com/var/git/teleforma into crfpa

Conflicts:
teleforma/views/core.py