]> git.parisson.com Git - telecaster-client.git/commitdiff
projects / telecaster-client.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7a6fbb7 d61bbf9)
Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/telecaster-client into dev
authoryomguy <yomguy@parisson.com>
Wed, 30 Jan 2013 11:28:12 +0000 (12:28 +0100)
committeryomguy <yomguy@parisson.com>
Wed, 30 Jan 2013 11:28:12 +0000 (12:28 +0100)
1  2 
telecaster/models.py patch | diff1 | diff2 | blob | history

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