46c9cdb2d5
Conflicts: billard/models.py |
||
---|---|---|
.. | ||
migrations | ||
static/billard | ||
templates | ||
__init__.py | ||
admin.py | ||
apps.py | ||
models.py | ||
serializers.py | ||
tasks.py | ||
tests.py | ||
urls.py | ||
utils.py | ||
views.py |
46c9cdb2d5
Conflicts: billard/models.py |
||
---|---|---|
.. | ||
migrations | ||
static/billard | ||
templates | ||
__init__.py | ||
admin.py | ||
apps.py | ||
models.py | ||
serializers.py | ||
tasks.py | ||
tests.py | ||
urls.py | ||
utils.py | ||
views.py |