Marco Quezada 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 роки тому
..
migrations 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 роки тому
scripts 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 роки тому
static 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 роки тому
templates 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 роки тому
unittests 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 роки тому
__init__.py 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 роки тому
admin.py 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 роки тому
forms.py 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 роки тому
models.py 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 роки тому
serializers.py 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 роки тому
tests.py 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 роки тому
urls.py 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 роки тому
views.py 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 роки тому