]> git.parisson.com Git - telemeta.git/commit
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)
commit02b8752f4f9a2457713930b0623f7c1e32538758
tree0fc63e6067caaeaea9b8163670312385c893c15c
parent02b390a6feee1aa432188a48f9a3f616f152aebb
parent21fd79c3a290d67626197094a0cb5230538684fd
Merge branch 'dev' into feature/haystack
examples/sandbox/settings.py
telemeta/models/item.py
telemeta/views/item.py