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

Merge remote-tracking branch 'origin/14_subscription_multicompany' into... 

Merge remote-tracking branch 'origin/14_subscription_multicompany' into 14_subscription_multicompany

# Conflicts:
#	energy_communities/security/res_users_role_data.xml
parents fb73e325 c41b94dc
No related branches found
No related tags found
2 merge requests!86Fix partners company,!69ADD rule multicompany to subscription.request model
Pipeline #22113 passed
Stage: test