]> git.parisson.com Git - telemeta.git/commit
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)
commitb9f81f4906e0692ab49879faa36f8975e75d8ce5
tree8b9ceed85d5678ffe5cc9d8ae5eb9e6e95332dce
parent58d65d7120dddaa63343e2afc96034b4a2755d53
parent1fe6f4cbdcdedaef8f025c1a989f0cec16c43c50
Merge branch 'dev'

Conflicts:
telemeta/views/item.py