Skip to content
Snippets Groups Projects
Commit cf6f4405 authored by Jean-François Ferry's avatar Jean-François Ferry
Browse files

Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into extrafields

Conflicts:
	htdocs/comm/propal.php
parents a8874ebc bbe68e34
No related branches found
No related tags found
No related merge requests found
Showing
with 269 additions and 160 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment