]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c1c04ef db98590)
Merge branch 'dev' into crem
authoryomguy <yomguy@parisson.com>
Mon, 1 Oct 2012 13:05:53 +0000 (15:05 +0200)
committeryomguy <yomguy@parisson.com>
Mon, 1 Oct 2012 13:05:53 +0000 (15:05 +0200)
Conflicts:
telemeta/templates/telemeta/base.html

1  2 
telemeta/models/media.py patch | diff1 | diff2 | blob | history

diff --cc telemeta/models/media.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.