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