]> git.parisson.com Git - docker-django-scripts.git/commitdiff
projects / docker-django-scripts.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 873848a a237230)
Merge branch 'dev' of github.com:Ircam-Web/mezzo-bin into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 14 Jun 2018 11:33:48 +0000 (13:33 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 14 Jun 2018 11:33:48 +0000 (13:33 +0200)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.