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 лет назад