aboutsummaryrefslogtreecommitdiffstats
path: root/vendor/composer/LICENSE
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-03-19 17:13:26 -0700
committerzotlabs <mike@macgirvin.com>2017-03-19 17:13:26 -0700
commitf746418fda3f29f4635a26c744990911e8fb6309 (patch)
treeec4f7bba45ca205c2edbd7ca730c4179ac20b083 /vendor/composer/LICENSE
parentbe10bf2cebd5d3ee449901cbf6814bf9a284bd10 (diff)
parent1bdab6e633fd023432ed86ad898da1fe4ddc470f (diff)
downloadvolse-hubzilla-f746418fda3f29f4635a26c744990911e8fb6309.tar.gz
volse-hubzilla-f746418fda3f29f4635a26c744990911e8fb6309.tar.bz2
volse-hubzilla-f746418fda3f29f4635a26c744990911e8fb6309.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'vendor/composer/LICENSE')
-rw-r--r--vendor/composer/LICENSE5
1 files changed, 1 insertions, 4 deletions
diff --git a/vendor/composer/LICENSE b/vendor/composer/LICENSE
index ee274f1d3..ecd380626 100644
--- a/vendor/composer/LICENSE
+++ b/vendor/composer/LICENSE
@@ -3,10 +3,7 @@ Upstream-Name: Composer
Upstream-Contact: Jordi Boggiano <j.boggiano@seld.be>
Source: https://github.com/composer/composer
-Files: *
-Copyright: 2016, Nils Adermann <naderman@naderman.de>
- 2016, Jordi Boggiano <j.boggiano@seld.be>
-License: Expat
+Copyright (c) Nils Adermann, Jordi Boggiano
Files: res/cacert.pem
Copyright: 2015, Mozilla Foundation