]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2fbdb41 488217d)
Merge branch 'crfpa' into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 24 Jun 2015 10:54:10 +0000 (12:54 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 24 Jun 2015 10:54:10 +0000 (12:54 +0200)
Conflicts:
teleforma/models/core.py

1  2 
teleforma/models/core.py patch | diff1 | diff2 | blob | history

diff --cc teleforma/models/core.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.