Merge branch 'master' into '94-post-nested-fields' (ed389128) · Commits · djangoldp-packages / djangoldp · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

djangoldp
- Activity
- Members
- Labels
- Environments
- Incidents

Snippets Groups Projects

ed389128

Commit ed389128 authored 6 years ago by Jean-Baptiste

Downloads
- Plain Diff

Merge branch 'master' into '94-post-nested-fields'

# Conflicts:
#   djangoldp/tests/models.py

parents db8b2ea4 2b242ee0

No related branches found

No related tags found

Loading

Pipeline #798 passed with stage

in 1 minute and 21 seconds

Changes 6
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

README.md 54 additions, 15 deletions

README.md
djangoldp/__init__.py 2 additions, 1 deletion

djangoldp/__init__.py
djangoldp/models.py 2 additions, 2 deletions

djangoldp/models.py
djangoldp/serializers.py 1 addition, 1 deletion

djangoldp/serializers.py
djangoldp/tests/models.py 5 additions, 3 deletions

djangoldp/tests/models.py
djangoldp/urls.py 3 additions, 3 deletions

djangoldp/urls.py

with 67 additions and 25 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