]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6c9c8e0 eb1f1b6)
Merge branch 'pro' of git+ssh://vcs.parisson.com/var/git/teleforma into pro
authoryomguy <yomguy@parisson.com>
Fri, 14 Dec 2012 10:02:43 +0000 (11:02 +0100)
committeryomguy <yomguy@parisson.com>
Fri, 14 Dec 2012 10:02:43 +0000 (11:02 +0100)
1  2 
teleforma/models/pro.py patch | diff1 | diff2 | blob | history

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