diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-03-11 12:21:26 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-03-11 12:21:26 -0400 |
| commit | b15ce31aa84ac2ae3d78e82868fb6065f15c99a4 (patch) | |
| tree | 2d547c505b65e23c2e0083098f1f860782a36dfb /doc/license.mdwn | |
| parent | 028916acae51217b27de59d19f70ecc24cc2ed36 (diff) | |
| parent | f0f17dd7ff1b6220526a9c42683d7c6272598f64 (diff) | |
Merge branch 'master' into adjustedbranch
Diffstat (limited to 'doc/license.mdwn')
| -rw-r--r-- | doc/license.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/license.mdwn b/doc/license.mdwn index 837fd8c3b..45e33714a 100644 --- a/doc/license.mdwn +++ b/doc/license.mdwn @@ -9,6 +9,6 @@ under the AGPL as a whole. git-annex built without the webapp does not include this code, so remains GPLed. git-annex contains a variety of other code, artwork, etc copyright by -others, under a variety of licences, including the [[LGPL]], BSD, +others, under a variety of licences, including the BSD, MIT, and Apache 2.0 licenses. For details, see [this file](http://source.git-annex.branchable.com/?p=source.git;a=blob_plain;f=debian/copyright;hb=HEAD). |