Skip to content

Commit

Permalink
Merge branch 'decomposition_result_form' into printResult_formPdf
Browse files Browse the repository at this point in the history
# Conflicts:
#	results/views.py
  • Loading branch information
urchinpro committed Oct 11, 2023
2 parents db76445 + 498be62 commit 5fd1fa2
Show file tree
Hide file tree
Showing 3 changed files with 485 additions and 475 deletions.
Loading

0 comments on commit 5fd1fa2

Please sign in to comment.