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

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

develop

Conflicts:
	htdocs/admin/multicurrency.php
parents 357877b1 b71c6a8a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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