Skip to content
Snippets Groups Projects
Commit a082ec36 authored by Daniil Digtyar Vasilieva's avatar Daniil Digtyar Vasilieva :call_me:
Browse files

Merge branch 'dev' into 'feature/unsubscribe-project-partner'

# Conflicts:
#   energy_selfconsumption/models/distribution_table.py
parents 27f3ebee e1e8d67e
No related branches found
No related tags found
2 merge requests!195[REL] 14.0.2.0.0,!185constrain added and unlink method extended
Pipeline #46567 passed
Showing
with 866 additions and 65 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 to comment