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

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

Conflicts:
	htdocs/install/mysql/data/llx_c_action_trigger.sql
parents 78cc976e 141ef91d
No related branches found
No related tags found
No related merge requests found
Showing with 129 additions and 49 deletions
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