]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'pro' of git+ssh://vcs.parisson.com/var/git/teleforma into pro
authorYoan Le Clanche <yoan@probarreau.pilotsystems.net>
Wed, 13 Feb 2013 15:25:38 +0000 (16:25 +0100)
committerYoan Le Clanche <yoan@probarreau.pilotsystems.net>
Wed, 13 Feb 2013 15:25:38 +0000 (16:25 +0100)
1  2 
teleforma/models/core.py

Simple merge