]> git.parisson.com Git - telemeta.git/commit
Merge branch 'feature/haystack' of github.com:afilsaime/Telemeta into feature/haystack
authorKaltar5679 <killian.mary@outlook.fr>
Wed, 29 Apr 2015 07:57:33 +0000 (09:57 +0200)
committerKaltar5679 <killian.mary@outlook.fr>
Wed, 29 Apr 2015 07:57:33 +0000 (09:57 +0200)
commit7275c8bfbe06d8d56420b5e996999ad8e7df80fc
tree103052ebc8ba3c5b3743a0b773d55bc89e8448f9
parent424a55f8940f7affb89bc1ef1a486f2e8d3eef96
parenta36ce6a26f9dfbaf3b8356583c9cca94d91bccbd
Merge branch 'feature/haystack' of github.com:afilsaime/Telemeta into feature/haystack

Conflicts:
telemeta/search_indexes.py
telemeta/views/haystack_search.py
telemeta/forms/haystack_form.py
telemeta/haystack_urls.py
telemeta/search_indexes.py
telemeta/views/haystack_search.py