Merge pull request #184 from netonicolas/feature/enumeration

author Guillaume Pellerin <yomguy@parisson.com>

Fri, 4 Aug 2017 05:36:16 +0000 (07:36 +0200)

committer GitHub <noreply@github.com>

Fri, 4 Aug 2017 05:36:16 +0000 (07:36 +0200)
author Guillaume Pellerin <yomguy@parisson.com>
Fri, 4 Aug 2017 05:36:16 +0000 (07:36 +0200)
committer GitHub <noreply@github.com>
Fri, 4 Aug 2017 05:36:16 +0000 (07:36 +0200)
diff --cc app/settings.py
Simple merge
diff --cc docker-compose.yml
Simple merge
author	Guillaume Pellerin <yomguy@parisson.com>
	Fri, 4 Aug 2017 05:36:16 +0000 (07:36 +0200)
committer	GitHub <noreply@github.com>
	Fri, 4 Aug 2017 05:36:16 +0000 (07:36 +0200)
		1	2
app/settings.py	patch \|	diff1 \|	diff2 \|	blob \| history
docker-compose.yml	patch \|	diff1 \|	diff2 \|	blob \| history