]> 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, 24 Apr 2015 08:02:25 +0000 (10:02 +0200)
committerKaltar5679 <killian.mary@outlook.fr>
Fri, 24 Apr 2015 08:02:25 +0000 (10:02 +0200)
commit959007ba3e1bc443509e1dcbb08ca830e89e653e
tree1665b98a8d4fc3173d2743f55ffa8e55de8c6df3
parenta61cc31bb3a4dd682bd11ea46b55810e8a5ddcc2
parent7ff06a265732a23fad06c9f3c378b8ef58d5e1e5
Merge branch 'feature/haystack' of github.com:afilsaime/Telemeta into feature/haystack

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