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

Merge branch 'syslog' of github.com:marcosgdf/dolibarr into 

marcosgdf-syslog

Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/fichinter/class/fichinter.class.php
	htdocs/projet/class/project.class.php
	htdocs/projet/class/task.class.php
parents 9631dc90 460fb7a4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 54 additions and 68 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