Marco Quezada 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request преди 11 години
..
migrations 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request преди 11 години
scripts 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request преди 11 години
static 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request преди 11 години
templates 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request преди 11 години
unittests 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request преди 11 години
__init__.py 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request преди 11 години
admin.py 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request преди 11 години
forms.py 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request преди 11 години
models.py 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request преди 11 години
serializers.py 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request преди 11 години
tests.py 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request преди 11 години
urls.py 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request преди 11 години
views.py 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request преди 11 години