]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 84cecc0 01a4f0a)
Merge branch 'dev' into crem2
authoryomguy <yomguy@parisson.com>
Thu, 4 Apr 2013 14:02:45 +0000 (16:02 +0200)
committeryomguy <yomguy@parisson.com>
Thu, 4 Apr 2013 14:02:45 +0000 (16:02 +0200)
1  2 
telemeta/views/item.py patch | diff1 | diff2 | blob | history

diff --cc telemeta/views/item.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.