]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 218a80d 29761fa)
Merge branch 'ae-docker-dev' of git.parisson.com:git/teleforma into ae-docker-dev
authorGael Le Mignot <gael@pilotsystems.net>
Thu, 7 Dec 2023 11:35:57 +0000 (12:35 +0100)
committerGael Le Mignot <gael@pilotsystems.net>
Thu, 7 Dec 2023 11:35:57 +0000 (12:35 +0100)
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.