]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'dev' of git.parisson.com:git/teleforma into feature/webclass
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 19 Jul 2017 12:03:16 +0000 (14:03 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 19 Jul 2017 12:03:16 +0000 (14:03 +0200)
1  2 
teleforma/models/core.py

Simple merge