| .. |
|
migrations
|
2a73b55a99
Fixed various merge conflicts pertaining to the prevention of the pull request
|
10 gadi atpakaļ |
|
scripts
|
66de6d9aae
Merging Marco's pull request
|
10 gadi atpakaļ |
|
static
|
2a73b55a99
Fixed various merge conflicts pertaining to the prevention of the pull request
|
10 gadi atpakaļ |
|
templates
|
2a73b55a99
Fixed various merge conflicts pertaining to the prevention of the pull request
|
10 gadi atpakaļ |
|
unittests
|
66de6d9aae
Merging Marco's pull request
|
10 gadi atpakaļ |
|
__init__.py
|
2a73b55a99
Fixed various merge conflicts pertaining to the prevention of the pull request
|
10 gadi atpakaļ |
|
admin.py
|
2a73b55a99
Fixed various merge conflicts pertaining to the prevention of the pull request
|
10 gadi atpakaļ |
|
forms.py
|
2a73b55a99
Fixed various merge conflicts pertaining to the prevention of the pull request
|
10 gadi atpakaļ |
|
models.py
|
2a73b55a99
Fixed various merge conflicts pertaining to the prevention of the pull request
|
10 gadi atpakaļ |
|
serializers.py
|
2a73b55a99
Fixed various merge conflicts pertaining to the prevention of the pull request
|
10 gadi atpakaļ |
|
tests.py
|
2a73b55a99
Fixed various merge conflicts pertaining to the prevention of the pull request
|
10 gadi atpakaļ |
|
urls.py
|
2a73b55a99
Fixed various merge conflicts pertaining to the prevention of the pull request
|
10 gadi atpakaļ |
|
views.py
|
2a73b55a99
Fixed various merge conflicts pertaining to the prevention of the pull request
|
10 gadi atpakaļ |
David Leonard
66de6d9aae
Merging Marco's pull request