]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 55b6a2d 1c490d2)
Merge branch 'dev' into crem
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 3 Mar 2014 22:49:18 +0000 (23:49 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 3 Mar 2014 22:49:18 +0000 (23:49 +0100)
Conflicts:
telemeta/views/item.py

1  2 
telemeta/views/item.py patch | diff1 | diff2 | blob | history

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