]> git.parisson.com Git - docker-django-scripts.git/commitdiff
Merge branch 'dev'
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 20 Jun 2018 14:50:28 +0000 (16:50 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 20 Jun 2018 14:50:28 +0000 (16:50 +0200)

Trivial merge