Merge branch 'master' into 'fix-what-i-broke' (46e472ed) · 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

46e472ed

Commit 46e472ed authored 5 years ago by ynerant

Downloads
- Plain Diff

Merge branch 'master' into 'fix-what-i-broke'

# Conflicts:
#   templates/base.html

parents 5f441490 e366f37e

No related branches found

No related tags found

1 merge request!56Corrections

Pipeline #7920 passed with warnings with stages

in 4 minutes

Changes 8
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

.gitmodules 3 additions, 0 deletions

.gitmodules
apps/member/models.py 2 additions, 0 deletions

apps/member/models.py
apps/note/forms.py 1 addition, 31 deletions

apps/note/forms.py
apps/note/models/notes.py 4 additions, 0 deletions

apps/note/models/notes.py
apps/note/models/transactions.py 5 additions, 0 deletions

apps/note/models/transactions.py
apps/note/views.py 10 additions, 11 deletions

apps/note/views.py
apps/scripts 1 addition, 0 deletions

apps/scripts
templates/note/conso_form.html 113 additions, 59 deletions

templates/note/conso_form.html

with 139 additions and 101 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