Merge branch 'feature/haystack' of github.com:Parisson/Telemeta into feature/haystack

author Raouf Benmansour <rbenmansour@iut.univ-paris8.fr>

Thu, 17 Dec 2015 13:46:32 +0000 (14:46 +0100)

committer Raouf Benmansour <rbenmansour@iut.univ-paris8.fr>

Thu, 17 Dec 2015 13:46:32 +0000 (14:46 +0100)
author Raouf Benmansour <rbenmansour@iut.univ-paris8.fr>
Thu, 17 Dec 2015 13:46:32 +0000 (14:46 +0100)
committer Raouf Benmansour <rbenmansour@iut.univ-paris8.fr>
Thu, 17 Dec 2015 13:46:32 +0000 (14:46 +0100)
diff --cc examples/sandbox/settings.py
Simple merge
diff --cc telemeta/models/collection.py
Simple merge
author	Raouf Benmansour <rbenmansour@iut.univ-paris8.fr>
	Thu, 17 Dec 2015 13:46:32 +0000 (14:46 +0100)
committer	Raouf Benmansour <rbenmansour@iut.univ-paris8.fr>
	Thu, 17 Dec 2015 13:46:32 +0000 (14:46 +0100)
		1	2
examples/sandbox/settings.py	patch \|	diff1 \|	diff2 \|	blob \| history
telemeta/models/collection.py	patch \|	diff1 \|	diff2 \|	blob \| history