Pipfile.lock
31.9 KB
-
Merge branch 'DEV' into 'CI' · 31560893
# Conflicts: # Pipfile # Pipfile.lock # recircle/recircle/settings.py # recircle/recircle/urls.py
Bodor Máté committed
# Conflicts: # Pipfile # Pipfile.lock # recircle/recircle/settings.py # recircle/recircle/urls.py