]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' into feature/haystack
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 9 Jul 2015 16:31:23 +0000 (18:31 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 9 Jul 2015 16:31:23 +0000 (18:31 +0200)
1  2 
examples/sandbox/settings.py
telemeta/models/item.py
telemeta/views/item.py

Simple merge
Simple merge
Simple merge