]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev'
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 26 Jan 2015 00:46:29 +0000 (01:46 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 26 Jan 2015 00:46:29 +0000 (01:46 +0100)
commit088d3782f4d9b20b2b9ba4c814f0b90a9df44563
tree556c4df4cb1d7927c5572834bb50e94136d7c4c9
parent23444e4696c74427d8e1de2d99de17c373649418
parentcd2b9de5ff52f1b172792e0abcfb4eabba079ad0
Merge branch 'dev'

Conflicts:
telemeta/views/item.py
telemeta/views/item.py