Skip to content
Snippets Groups Projects
Commit cba73b23 authored by Florian Henry's avatar Florian Henry
Browse files

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

develop

Conflicts:
	htdocs/comm/propal.php

Change-Id: I5639c70165c8e1149f3934248737817a02efff0c
parents 24a6321d 9659ecba
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 454 additions and 505 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment