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

author Guillaume Pellerin <guillaume.pellerin@ircam.fr>

Fri, 27 Jan 2017 11:29:06 +0000 (12:29 +0100)

committer Guillaume Pellerin <guillaume.pellerin@ircam.fr>

Fri, 27 Jan 2017 11:29:06 +0000 (12:29 +0100)
author Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 27 Jan 2017 11:29:06 +0000 (12:29 +0100)
committer Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 27 Jan 2017 11:29:06 +0000 (12:29 +0100)
diff --cc docker-compose.yml
Simple merge
diff --cc setup.py
Simple merge
author	Guillaume Pellerin <guillaume.pellerin@ircam.fr>
	Fri, 27 Jan 2017 11:29:06 +0000 (12:29 +0100)
committer	Guillaume Pellerin <guillaume.pellerin@ircam.fr>
	Fri, 27 Jan 2017 11:29:06 +0000 (12:29 +0100)
		1	2
docker-compose.yml	patch \|	diff1 \|	diff2 \|	blob \| history
setup.py	patch \|	diff1 \|	diff2 \|	blob \| history