Merge branch 'dev' of https://github.com/Parisson/Telemeta into crem

author Guillaume Pellerin <yomguy@parisson.com>

Fri, 10 Jun 2016 09:09:37 +0000 (11:09 +0200)

committer Guillaume Pellerin <yomguy@parisson.com>

Fri, 10 Jun 2016 09:09:37 +0000 (11:09 +0200)
author Guillaume Pellerin <yomguy@parisson.com>
Fri, 10 Jun 2016 09:09:37 +0000 (11:09 +0200)
committer Guillaume Pellerin <yomguy@parisson.com>
Fri, 10 Jun 2016 09:09:37 +0000 (11:09 +0200)
diff --cc app/settings.py
Simple merge
diff --cc docker-compose.yml
Simple merge
author	Guillaume Pellerin <yomguy@parisson.com>
	Fri, 10 Jun 2016 09:09:37 +0000 (11:09 +0200)
committer	Guillaume Pellerin <yomguy@parisson.com>
	Fri, 10 Jun 2016 09:09:37 +0000 (11:09 +0200)
		1	2
app/settings.py	patch \|	diff1 \|	diff2 \|	blob \| history
docker-compose.yml	patch \|	diff1 \|	diff2 \|	blob \| history