]> git.parisson.com Git - teleforma.git/commit
Merge branch 'ae' of git+ssh://vcs.parisson.com/var/git/teleforma into ae
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 19 Nov 2013 15:04:45 +0000 (16:04 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 19 Nov 2013 15:04:45 +0000 (16:04 +0100)
commitff1835f53e40ee4946944693333fc867e9acb9c4
treec3bac77dcab21322ddf140f646fdccbafc273f9c
parent7e4743f79e34d3b5da1775720126ed97ce25b813
parentbcd6dc58ab1374dc59f79e63c466cd78fc34cb81
Merge branch 'ae' of git+ssh://vcs.parisson.com/var/git/teleforma into ae

Conflicts:
teleforma/views/core.py