Skip to content
Snippets Groups Projects
Commit ca0872aa authored by MikaelKrats's avatar MikaelKrats
Browse files

Merge branch 'main' into localization-multicurrency-2 

Fixed Conflicts:
#	src/tjts5901/templates/addItem.html
#	src/tjts5901/views.py
parents a8c97f26 d1a98bb9
Branches main
No related tags found
1 merge request!60Multicurrency
Pipeline #15952 passed
Stage: build
    Stage: test
      Hide whitespace changes
      Inline Side-by-side
      0% or .
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment