]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 58d65d7 1fe6f4c)
Merge branch 'dev'
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 22 Jan 2016 10:02:42 +0000 (11:02 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 22 Jan 2016 10:02:42 +0000 (11:02 +0100)
Conflicts:
telemeta/views/item.py


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.