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

Merge remote-tracking branch 'origin/14_subscription_multicompany' into...
c70d753a · Daniil Digtyar Vasilieva · fb73e325 · c41b94dc · c70d753a
Commit c70d753a authored 2 years ago by Daniil Digtyar Vasilieva
--- a/energy_communities/security/res_users_role_data.xml
+++ b/energy_communities/security/res_users_role_data.xml
@@ -67,4 +67,4 @@
               (4, ref('mass_mailing.group_mass_mailing_user')),
        ]"/>
    </record>
-</odoo>
\ No newline at end of file
+</odoo>