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 година