]> git.parisson.com Git - mezzo.git/commit
Merge branch 'feature/package' into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 5 Dec 2016 00:12:28 +0000 (01:12 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 5 Dec 2016 00:12:28 +0000 (01:12 +0100)
commit3f2ad34913d9bc3530384e84cbf53d17cff177e9
tree70f30e4c989426f62453ada760a1dd2c1073ab1c
parentd0fc8c4c1721c2208957305383166c66c1ae24bf
parent9bed1a56e49e53cd4f1b6d116298c48586fd395c
Merge branch 'feature/package' into dev

Conflicts:
.gitignore
.gitignore
docker-compose.yml
etc/nginx/conf.d/default.conf