]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e2ce48c c8a94dc)
Merge branch 'crem' into diadems
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 21 Feb 2014 16:47:06 +0000 (17:47 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 21 Feb 2014 16:47:06 +0000 (17:47 +0100)
Conflicts:
telemeta/views/item.py

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.