]> 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: 2f0d074 2894add)
Merge branch 'master' into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 29 May 2018 10:46:24 +0000 (12:46 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 29 May 2018 10:46:24 +0000 (12:46 +0200)

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