]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d8e47dc 5bfb7b2)
Merge remote-tracking branch 'origin/master' into crem
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 15 Feb 2018 14:42:00 +0000 (15:42 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 15 Feb 2018 14:42:00 +0000 (15:42 +0100)
1  2 
docker-compose.yml patch | diff1 | diff2 | blob | history

diff --cc docker-compose.yml
Simple merge
Unnamed repository; edit this file 'description' to name the repository.