Commit 31560893 by Bodor Máté

Merge branch 'DEV' into 'CI'

# Conflicts:
#   Pipfile
#   Pipfile.lock
#   recircle/recircle/settings.py
#   recircle/recircle/urls.py
parents d816a212 353a668c
Pipeline #741 failed with stages
in 28 seconds