]> git.parisson.com Git - telemeta.git/commit
Merge branch 'feature/haystack' of github.com:afilsaime/Telemeta into feature/haystack
authorKaltar5679 <killian.mary@outlook.fr>
Fri, 12 Jun 2015 12:59:07 +0000 (14:59 +0200)
committerKaltar5679 <killian.mary@outlook.fr>
Fri, 12 Jun 2015 12:59:07 +0000 (14:59 +0200)
commit16e83948fa9be366012bb5bc1b023b0249631192
tree5cb147031ba168e627cfd6d71a67d734db2b1dfa
parent66c54f35cca825cbb7c058bdf0f67ab46910a879
parent231bf3d9abc0c81e0ec816d2790714eb004875f2
Merge branch 'feature/haystack' of github.com:afilsaime/Telemeta into feature/haystack

Conflicts:
src/django-haystack
telemeta/search_indexes.py