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

Merge branch 'dev' into 'hotfix/setup_name_error' 

# Conflicts:
#   setup/energy_selfconsumption_cooperator/setup.py
parents b736c185 9d6ad6e8
No related branches found
No related tags found
2 merge requests!138Hotfix setup name error,!137[Hotfix] dev setup name error
Pipeline #32594 passed
Stage: test
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
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