Merge branch 'master' into api (00d560c2) · Commits · BDE / nk20 · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

nk20
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

00d560c2

Commit 00d560c2 authored 5 years ago by ynerant

Downloads
- Plain Diff

Merge branch 'master' into api

# Conflicts:
#	apps/note/forms.py
#	apps/note/urls.py
#	apps/note/views.py

parents 59668649 9cc0731d

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

apps/member/models.py 3 additions, 0 deletions

apps/member/models.py
apps/note/admin.py 10 additions, 1 deletion

apps/note/admin.py
apps/note/forms.py 13 additions, 0 deletions

apps/note/forms.py
apps/note/models/__init__.py 2 additions, 2 deletions

apps/note/models/__init__.py
apps/note/models/transactions.py 22 additions, 2 deletions

apps/note/models/transactions.py
apps/note/urls.py 2 additions, 0 deletions

apps/note/urls.py
apps/note/views.py 31 additions, 3 deletions

apps/note/views.py
templates/base.html 1 addition, 1 deletion

templates/base.html
templates/note/conso_form.html 41 additions, 0 deletions

templates/note/conso_form.html

with 125 additions and 9 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