]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b19fb48 35efe7a)
Merge branch 'pb-docker-dev' of git.parisson.com:git/teleforma into pb-docker-dev
authorYoan Le Clanche <yoanl@pilotsystems.net>
Tue, 30 Aug 2022 09:47:25 +0000 (11:47 +0200)
committerYoan Le Clanche <yoanl@pilotsystems.net>
Tue, 30 Aug 2022 09:47:25 +0000 (11:47 +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.