]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'feature/haystack' of github.com:afilsaime/Telemeta into feature/haystack
authorafilsaime <shadow_kungfu@hotmail.fr>
Thu, 30 Apr 2015 10:15:07 +0000 (12:15 +0200)
committerafilsaime <shadow_kungfu@hotmail.fr>
Thu, 30 Apr 2015 10:15:07 +0000 (12:15 +0200)
1  2 
telemeta/forms/haystack_form.py
telemeta/models/item.py
telemeta/views/haystack_search.py

Simple merge
Simple merge
Simple merge