Merge branch 'master' into 'depth-parameter' (5663d041) · Commits · djangoldp-packages / djangoldp · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

djangoldp
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

5663d041

Commit 5663d041 authored 6 years ago by Jean-Baptiste

Downloads
- Plain Diff

Merge branch 'master' into 'depth-parameter'

# Conflicts:
#   djangoldp/views.py

parents ea5645d6 ceb386e8

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

djangoldp/serializers.py 78 additions, 19 deletions

djangoldp/serializers.py
djangoldp/tests.py 0 additions, 3 deletions

djangoldp/tests.py
djangoldp/tests/models.py 12 additions, 0 deletions

djangoldp/tests/models.py
djangoldp/tests/runner.py 29 additions, 0 deletions

djangoldp/tests/runner.py
djangoldp/tests/tests.py 45 additions, 0 deletions

djangoldp/tests/tests.py
djangoldp/tests/urls.py 9 additions, 0 deletions

djangoldp/tests/urls.py
djangoldp/views.py 3 additions, 0 deletions

djangoldp/views.py

with 176 additions and 22 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment