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

Merge remote-tracking branch 'origin/3.3' into 3.4 

Conflicts:
	build/makepack-dolibarr.pl
parents 2e2f86b9 f652a4d8
Branches
Tags
No related merge requests found
Expand all Show whitespace changes
Inline Side-by-side
build/debian/dolibarr.install
+ 0
− 1
View file @ 7a741e06
debian/dolibarr.desktop usr/share/applications
debian/dolibarr.xpm usr/share/pixmaps
ChangeLog usr/share/doc/dolibarr
README usr/share/doc/dolibarr
doc/install usr/share/doc/dolibarr
doc/user usr/share/doc/dolibarr
......
build/makepack-dolibarr.pl
+ 247
− 93
View file @ 7a741e06
This diff is collapsed.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment