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

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

marcosgdf-misc

Conflicts:
	htdocs/barcode/codeinit.php
parents cc1d5066 e485dd41
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 61 additions and 73 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