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

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

into develop

Conflicts:
	build/launchpad/README
parents e5d564b4 6055a758
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
build/launchpad/README
+ 1
− 1
View file @ aefc8c65
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment