search

julius-network-solutions / julius-openobject-addons

19 stars 39 forks source link

Mig partner siret #21

Closed flotho closed 5 years ago

mathieuvatel commented 9 years ago

Hello Florent Thomas,

There is a conflict between your branch and mine, I can't merge them. Maybe you can uncommit the 1st commit done (which is putting all the addons into unported folder) then I will be able to merge them.

Thank you in advance.