]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 74ed11a aace960)
Merge branch 'master' of git.parisson.com:git/teleforma
authorGuillaume Pellerin <guillaume.pellerin@parisson.com>
Wed, 23 Jun 2021 16:53:10 +0000 (18:53 +0200)
committerGuillaume Pellerin <guillaume.pellerin@parisson.com>
Wed, 23 Jun 2021 16:53:10 +0000 (18:53 +0200)
1  2 
app/settings.py patch | diff1 | diff2 | blob | history

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