Skip to content
Snippets Groups Projects
Commit 3ad0e8d9 authored by borzechof99's avatar borzechof99 :whale2:
Browse files

Merge branch 'master' into '37-add-internationalization-to-models' 

# Conflicts:
#   unisportomat/unisportomat/settings.py
parents 86845553 a868600e
Branches
No related tags found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment