]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into feature/haystack
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 7 Apr 2015 10:41:23 +0000 (12:41 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 7 Apr 2015 10:41:23 +0000 (12:41 +0200)
commit60fb7906323c8f1d41292f97b0a98be90ec790ee
tree500a3876c7b575398c4e75228324640bad14a3e2
parentc35d9a3967b17026a894db5533a142b66b9a41f8
parent59d48b5920a0d66563064cef1a1f62489ccf74a5
Merge branch 'dev' into feature/haystack

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