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