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

Merge branch 'patch-14' of https://github.com/defrance69/dolibarr into 

defrance69-patch-14

Conflicts:
	htdocs/install/mysql/migration/3.4.0-3.5.0.sql
parents 305ca252 a9308ca3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 153 additions and 8 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