Skip to content
Snippets Groups Projects
Commit a9c1ce4a authored by Damien's avatar Damien
Browse files

Merge branch 'develop' of labs.maarch.org:maarch/MaarchCourrier into develop

Conflicts:
	apps/maarch_entreprise/xml/entreprise.xml
parents 89d22aa7 18bc0953
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment