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