Marco Quezada 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 years ago
..
migrations 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 years ago
scripts 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 years ago
static 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 years ago
templates 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 years ago
unittests 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 years ago
__init__.py 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 years ago
admin.py 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 years ago
forms.py 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 years ago
models.py 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 years ago
serializers.py 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 years ago
tests.py 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 years ago
urls.py 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 years ago
views.py 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 years ago