]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 58e9a65 1b5ee7d)
Merge branch 'dev' 1.6a
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 11 Sep 2015 14:52:45 +0000 (16:52 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 11 Sep 2015 14:52:45 +0000 (16:52 +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.