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

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

develop

Conflicts:
	htdocs/langs/ca_ES/admin.lang
	htdocs/langs/es_ES/admin.lang

Change-Id: I3c2c0789a92fb3d5506c717986ce0127dec75b9b
parents cc497490 263e9098
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 223 additions and 139 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment