Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

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

Snippets Groups Projects

96ca91e9

Commit 96ca91e9 authored 6 years ago by Matthieu Fesselier

Downloads
- Plain Diff

Merge branch 'master' into 'subscription-system'

# Conflicts:
#   djangoldp_notification/urls.py

parents 5352ba93 b50066a3

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

djangoldp_notification/migrations/0001_initial.py 3 additions, 2 deletions

djangoldp_notification/migrations/0001_initial.py
djangoldp_notification/migrations/0002_auto_20190301_0418.py 21 additions, 0 deletions

djangoldp_notification/migrations/0002_auto_20190301_0418.py
djangoldp_notification/models.py 3 additions, 2 deletions

djangoldp_notification/models.py
djangoldp_notification/urls.py 2 additions, 1 deletion

djangoldp_notification/urls.py

with 29 additions and 5 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