]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into crem2
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 17 Dec 2013 17:11:34 +0000 (18:11 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 17 Dec 2013 17:11:34 +0000 (18:11 +0100)
commit0e7cf2cae1188b5538c86c4408be762607a385c6
tree5d09cf9f588b9fbf4fbac52e028a437646954cd2
parent7d3d9ece1d3df440504424da5c3e5755cfab4fa2
parentc4e68e0a554eb3a68efd03823d6d9508bd54fd03
Merge branch 'dev' into crem2

Conflicts:
telemeta/models/media.py
telemeta/models/query.py
telemeta/urls.py
telemeta/views/item.py