diff options
author | zotlabs <mike@macgirvin.com> | 2017-03-19 17:13:26 -0700 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2017-03-19 17:13:26 -0700 |
commit | f746418fda3f29f4635a26c744990911e8fb6309 (patch) | |
tree | ec4f7bba45ca205c2edbd7ca730c4179ac20b083 /vendor/composer/LICENSE | |
parent | be10bf2cebd5d3ee449901cbf6814bf9a284bd10 (diff) | |
parent | 1bdab6e633fd023432ed86ad898da1fe4ddc470f (diff) | |
download | volse-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/LICENSE | 5 |
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 |