Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/3.5' into 3.6
Browse files Browse the repository at this point in the history
  • Loading branch information
eldy committed Jan 31, 2016
2 parents b27e31b + d9e0892 commit 1b23ede
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions build/debian/copyright
Expand Up @@ -159,7 +159,7 @@ Comments:
Those files are not shipped in the binary package as we
configure Dolibarr to use Dejavu fonts from "fonts-dejavu-core".

Files: docs/images/*
Files: doc/images/*
Copyright: Laurent Destailleur
License: CC-BY-SA-3.0
You are free:
Expand All @@ -176,7 +176,7 @@ License: CC-BY-SA-3.0
.
For more information, see http://creativecommons.org/licenses/by-sa/3.0/

Files: htdocs/includes/fpdi/*
Files: htdocs/includes/fpdfi/*
Copyright: 2004-2011 Setasign - Jan Slabon
License: GPL-2+
This program is free software; you can redistribute it
Expand Down

0 comments on commit 1b23ede

Please sign in to comment.