]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 25ca6d3 684294f)
Merge branch 'dev'
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 31 Aug 2015 09:06:20 +0000 (11:06 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 31 Aug 2015 09:06:20 +0000 (11:06 +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.