Eliot Berriot 57e685d783 Merge branch 'master' into develop		2017-06-26 22:14:41 +02:00
..
docker-compose.yml	Added documentation about music acquisition	2017-06-25 23:33:19 +02:00
env.prod.sample	Fixed #20: added admin serving under /api/, minor tweaks to production nginx and env file	2017-06-26 19:18:31 +02:00
nginx.conf	Merge branch 'master' into develop	2017-06-26 22:14:41 +02:00