Merge branch 'main' into 'new_logo' (19e77df2) · 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

19e77df2

Commit 19e77df2 authored 9 months ago by korenstin

Downloads
- Plain Diff

Merge branch 'main' into 'new_logo'

# Conflicts:
#   .gitlab-ci.yml

parents ec759dd3 5fd6ec56

No related branches found

No related tags found

Loading

Pipeline #13979 failed with stages

in 11 seconds

Changes 9
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 2 additions, 2 deletions

.gitlab-ci.yml
apps/activity/templates/activity/activity_form.html 3 additions, 0 deletions

apps/activity/templates/activity/activity_form.html
apps/member/views.py 1 addition, 1 deletion

apps/member/views.py
apps/note/api/views.py 1 addition, 1 deletion

apps/note/api/views.py
apps/note/tests/test_transactions.py 1 addition, 1 deletion

apps/note/tests/test_transactions.py
apps/treasury/api/views.py 1 addition, 1 deletion

apps/treasury/api/views.py
apps/treasury/urls.py 2 additions, 2 deletions

apps/treasury/urls.py
locale/fr/LC_MESSAGES/django.po 4 additions, 0 deletions

locale/fr/LC_MESSAGES/django.po
note_kfet/templates/base.html 2 additions, 0 deletions

note_kfet/templates/base.html

with 17 additions and 8 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