]> git.parisson.com Git - telemeta.git/commit
Merge branch 'feature/haystack' of github.com:afilsaime/Telemeta into feature/haystack
authorafilsaime <shadow_kungfu@hotmail.fr>
Tue, 5 May 2015 12:55:45 +0000 (14:55 +0200)
committerafilsaime <shadow_kungfu@hotmail.fr>
Tue, 5 May 2015 12:55:45 +0000 (14:55 +0200)
commit107a875c66d8341f777b59ae43ec17d78bf2b5f3
tree9a43566a676a8eb27fffb6a6c6b49f5ded60d5f5
parent9ca0576a7b7c804db6636e1497cdd5af240743aa
parentd7fe7d659621e05ea62dadc89f111de818cdb1e5
Merge branch 'feature/haystack' of github.com:afilsaime/Telemeta into feature/haystack

Conflicts:
telemeta/search_indexes.py
telemeta/forms/haystack_form.py
telemeta/search_indexes.py