]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a205ec9 ecd7964)
Merge branch 'crem' of git+ssh://vcs.parisson.com/var/git/telemeta
authoryomguy <yomguy@parisson.com>
Mon, 6 Feb 2012 21:59:57 +0000 (22:59 +0100)
committeryomguy <yomguy@parisson.com>
Mon, 6 Feb 2012 21:59:57 +0000 (22:59 +0100)
Conflicts:
telemeta/templates/telemeta_default/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.