]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e0e2dd1 54f708a)
Merge branch 'dev' of git.parisson.com:git/teleforma into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 13 Nov 2017 14:45:18 +0000 (15:45 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 13 Nov 2017 14:45:18 +0000 (15:45 +0100)
1  2 
teleforma/models/crfpa.py patch | diff1 | diff2 | blob | history
teleforma/views/core.py patch | diff1 | diff2 | blob | history

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