]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 043c6cd db98590)
Merge branch 'dev' into lam
authoryomguy <yomguy@parisson.com>
Mon, 1 Oct 2012 13:07:46 +0000 (15:07 +0200)
committeryomguy <yomguy@parisson.com>
Mon, 1 Oct 2012 13:07:46 +0000 (15:07 +0200)
Conflicts:
telemeta/templates/telemeta/mediaitem_detail.html
telemeta/views/item.py


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