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

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

parents c3c9e599 2ce6f55d
Branches
Tags
No related merge requests found
...@@ -59,6 +59,24 @@ License: GPL-3+ ...@@ -59,6 +59,24 @@ License: GPL-3+
`/usr/share/common-licenses/GPL-2'. `/usr/share/common-licenses/GPL-2'.
Files: docs/images/*
Copyright: Laurent Destailleur
License: CC-BY-SA-3.0
You are free:
to Share (to copy, distribute and transmit the work) and
to Remix (to adapt the work) under the following conditions:
.
Attribution - You must attribute the work in the manner specified by the
author or licensor (but not in any way that suggests that they endorse you
or your use of the work).
.
Share Alike - If you alter, transform, or build upon this work, you may
distribute the resulting work only under the same, similar or a compatible
license.
.
For more information, see http://creativecommons.org/licenses/by-sa/3.0/
Files: htdocs/includes/fpdi/* Files: htdocs/includes/fpdi/*
Copyright: FPDFI team Copyright: FPDFI team
License: GPL-2+ License: GPL-2+
......
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment