]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into feature/epub
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 16 Apr 2015 12:53:32 +0000 (14:53 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 16 Apr 2015 12:53:32 +0000 (14:53 +0200)
commit92191d25abd5b5957c60404b7e2a43f5b9a904f7
tree871fd7df52828d9b285bd4cf33f99f33581a348c
parentca22a6c3858a5aeed8d13bafc922b01d301f675e
parent22ac4234d1a2d444cbc73a37ca0ef0a0ec312dff
Merge branch 'dev' into feature/epub

Conflicts:
examples/sandbox/settings.py
telemeta/models/collection.py
telemeta/models/item.py
examples/sandbox/settings.py
telemeta/models/collection.py
telemeta/models/item.py
telemeta/models/resource.py
telemeta/templates/telemeta/collection_epub.html
telemeta/urls.py
telemeta/views/collection.py
telemeta/views/core.py
telemeta/views/resource.py