Merge branch 'master' into 'jbpasquier/permissions' (c1cc6a25) · 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

c1cc6a25

Commit c1cc6a25 authored 5 years ago by Jean-Baptiste Pasquier

Downloads
- Plain Diff

Merge branch 'master' into 'jbpasquier/permissions'

# Conflicts:
#   djangoldp/__init__.py

parents 5f588062 90655732

No related branches found

No related tags found

Loading

Pipeline #1017 passed with stage

in 1 minute and 20 seconds

Changes 5
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

djangoldp/__init__.py 1 addition, 1 deletion

djangoldp/__init__.py
djangoldp/models.py 1 addition, 2 deletions

djangoldp/models.py
djangoldp/serializers.py 1 addition, 18 deletions

djangoldp/serializers.py
djangoldp/tests/tests_update.py 6 additions, 5 deletions

djangoldp/tests/tests_update.py
djangoldp/views.py 54 additions, 5 deletions

djangoldp/views.py

with 63 additions and 31 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