]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ee19f90 a1cee86)
Merge remote-tracking branch 'origin/master' into crem
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 4 Jun 2018 11:10:39 +0000 (13:10 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 4 Jun 2018 11:10:39 +0000 (13:10 +0200)
1  2 
app/settings.py patch | diff1 | diff2 | blob | history
docker-compose.yml patch | diff1 | diff2 | blob | history

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