]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into feature/haystack
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 17 Apr 2015 16:21:01 +0000 (18:21 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 17 Apr 2015 16:21:01 +0000 (18:21 +0200)
commit4af19af1ca551145cf98a0941b57e86af7259de3
treef277d44f80da600c9bb831c52f8a3230a092d0a4
parentc0c8411bc3d1cb3dd51b6dbed42d91002feb8592
parent03651dbf39cb5d6649130377257ec2cb4800ec7c
Merge branch 'dev' into feature/haystack

Conflicts:
setup.py
examples/sandbox/settings.py
setup.py
telemeta/urls.py