]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'pb-docker' of git.parisson.com:git/teleforma into pb-docker
authorGuillaume Pellerin <guillaume.pellerin@parisson.com>
Wed, 15 Jun 2022 15:39:45 +0000 (17:39 +0200)
committerGuillaume Pellerin <guillaume.pellerin@parisson.com>
Wed, 15 Jun 2022 15:39:45 +0000 (17:39 +0200)
1  2 
app/settings.py

diff --cc app/settings.py
Simple merge