]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9171edf 59616f1)
Merge remote-tracking branch 'origin/dev' into crem
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 1 Mar 2016 00:01:18 +0000 (01:01 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 1 Mar 2016 00:01:18 +0000 (01:01 +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.