]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into feature/haystack
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 26 Jun 2015 00:09:08 +0000 (02:09 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 26 Jun 2015 00:09:08 +0000 (02:09 +0200)
commit8308cc5b133db7850efac9c8e3e99d7ef3890a4d
treea0c501c45d8a55cc576d7c136cf8bf7bc042eacb
parent302547379eba83370725810035e4664e98fa6254
parent9e7ea951936e65d5b2903c125b9134da807e1d9f
Merge branch 'dev' into feature/haystack
examples/sandbox/settings.py
telemeta/templatetags/telemeta_utils.py
telemeta/urls.py
telemeta/views/core.py
telemeta/views/item.py