-
Joost Rijneveld authored
Conflicts: website/thaliawebsite/locale/nl/LC_MESSAGES/django.mo website/thaliawebsite/locale/nl/LC_MESSAGES/django.po website/thaliawebsite/menus.py website/thaliawebsite/urls.py
Conflicts: website/thaliawebsite/locale/nl/LC_MESSAGES/django.mo website/thaliawebsite/locale/nl/LC_MESSAGES/django.po website/thaliawebsite/menus.py website/thaliawebsite/urls.py