]> git.parisson.com Git - teleforma.git/commit
Merge branch 'crfpa' into tc202
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 19 Jul 2013 13:35:24 +0000 (15:35 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 19 Jul 2013 13:35:24 +0000 (15:35 +0200)
commit343f60e0131be523e0051b34bf8fad43bd6a2988
treef642f28e724736dedc6a568b934190b627aa3507
parent3fc70b90db10e82fc19b29f3b91ce39953e4cca7
parent499efb1ef13353860c1759dfb74463ab61bcd9ce
Merge branch 'crfpa' into tc202

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