fnp / redakcja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 440a9c4 6b0f855)
Merge branch 'master' of ssh://s.mdrn.pl:2224/srv/redakcja.wolnelektury.pl/git
authorRadek Czajka <rczajka@rczajka.pl>
Sun, 22 Mar 2020 09:42:44 +0000 (10:42 +0100)
committerRadek Czajka <rczajka@rczajka.pl>
Sun, 22 Mar 2020 09:42:44 +0000 (10:42 +0100)
1  2 
requirements/requirements.txt patch | diff1 | diff2 | blob | history
src/redakcja/settings/__init__.py patch | diff1 | diff2 | blob | history

diff --cc requirements/requirements.txt
Simple merge
diff --cc src/redakcja/settings/__init__.py
Simple merge