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

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

Conflicts:
	htdocs/install/mysql/tables/llx_c_type_resource.key.sql
parents 338fc5f2 f1993e71
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment