Merge branch 'master' of...
Merge branch 'master' of git.happy-dev.fr:startinblox/djangoldp-packages/djangoldp into add-test-permissions # Conflicts: # djangoldp/serializers.py # djangoldp/tests.py
No related branches found
No related tags found
Showing
- djangoldp/factories.py 1 addition, 0 deletionsdjangoldp/factories.py
- djangoldp/serializers.py 77 additions, 20 deletionsdjangoldp/serializers.py
- djangoldp/tests.py 0 additions, 75 deletionsdjangoldp/tests.py
- djangoldp/tests/models.py 12 additions, 0 deletionsdjangoldp/tests/models.py
- djangoldp/tests/runner.py 29 additions, 0 deletionsdjangoldp/tests/runner.py
- djangoldp/tests/tests.py 45 additions, 0 deletionsdjangoldp/tests/tests.py
- djangoldp/tests/urls.py 9 additions, 0 deletionsdjangoldp/tests/urls.py
- djangoldp/views.py 62 additions, 50 deletionsdjangoldp/views.py
Loading
Please register or sign in to comment