Merge branch 'beta' into 'master' (2b2dde85) · 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

2b2dde85

Commit 2b2dde85 authored 4 years ago by ynerant

Downloads
- Plain Diff

Merge branch 'beta' into 'master'

Few fixes

Closes #61

See merge request !110

parents 863150d2 9f619a9d

2 merge requests!132Erdnaxe master patch 99095,!110Few fixes

Pipeline #8646 passed with warnings with stages

in 10 minutes

Changes 9
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

ansible/base.yml 1 addition, 1 deletion

ansible/base.yml
apps/activity/tests/test_activities.py 0 additions, 1 deletion

apps/activity/tests/test_activities.py
apps/note/models/notes.py 1 addition, 1 deletion

apps/note/models/notes.py
apps/note/tables.py 2 additions, 1 deletion

apps/note/tables.py
apps/note/templates/note/transaction_form.html 1 addition, 1 deletion

apps/note/templates/note/transaction_form.html
apps/permission/fixtures/initial.json 23 additions, 2 deletions

apps/permission/fixtures/initial.json
apps/scripts 1 addition, 1 deletion

apps/scripts
apps/treasury/tests/test_treasury.py 0 additions, 1 deletion

apps/treasury/tests/test_treasury.py
note.cron 5 additions, 5 deletions

note.cron

with 34 additions and 14 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