]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d5b93d9 f508cfc)
Merge remote-tracking branch 'origin/master' into demo
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 25 Apr 2016 18:49:40 +0000 (20:49 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 25 Apr 2016 18:49:40 +0000 (20:49 +0200)
Conflicts:
telemeta/pages

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.