]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 63d3d7e ba004d4)
Merge branch 'recovery' into feature/recovery
authorGuillaume Pellerin <guillaume.pellerin@parisson.com>
Mon, 22 Nov 2021 10:21:25 +0000 (11:21 +0100)
committerGuillaume Pellerin <guillaume.pellerin@parisson.com>
Mon, 22 Nov 2021 10:21:25 +0000 (11:21 +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.