Skip to content
Snippets Groups Projects
Commit 46e9b5d5 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

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

grandoc-develop

Conflicts:
	htdocs/langs/ar_SA/admin.lang
	htdocs/langs/el_GR/admin.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/tr_TR/admin.lang
parents e833849f 1855ba55
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 93 additions and 97 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment