]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a4fdb7f 11cf306)
Merge branch 'feature/epub' into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 17 Apr 2015 16:19:04 +0000 (18:19 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 17 Apr 2015 16:19:04 +0000 (18:19 +0200)
1  2 
telemeta/models/item.py patch | diff1 | diff2 | blob | history

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