]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 53d8b72 2d67bbc)
Merge branch 'pro' of git+ssh://vcs.parisson.com/var/git/teleforma into pro
authorYoan Le Clanche <yoan@probarreau.pilotsystems.net>
Mon, 28 Jan 2013 14:30:07 +0000 (15:30 +0100)
committerYoan Le Clanche <yoan@probarreau.pilotsystems.net>
Mon, 28 Jan 2013 14:30:07 +0000 (15:30 +0100)
1  2 
teleforma/models/core.py patch | diff1 | diff2 | blob | history
teleforma/models/pro.py patch | diff1 | diff2 | blob | history

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