summaryrefslogtreecommitdiff
path: root/debian/copyright
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2015-01-13 16:53:38 -0500
committerMicah Anderson <micah@riseup.net>2015-01-13 16:53:38 -0500
commit1d2648554006335bc04c4ae21c423578dbd8ee19 (patch)
tree6ab6a6e5f183addc1e3822c5cea0bb1f29528c3d /debian/copyright
parentea9bdf4f0802285238b5432b5f05decb5267b218 (diff)
parent67b738c2f5922dbc5cf105e9617ce6d1d5e4e8e3 (diff)
Merge branch 'debian/experimental' into ppappa
Conflicts: debian/changelog
Diffstat (limited to 'debian/copyright')
-rw-r--r--debian/copyright2
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/copyright b/debian/copyright
index f23ac59..7a9d97b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,7 +5,7 @@ Source: <http://github.com/leapcode/leap_mail/>
Files: *
Copyright: 2012,2013 The LEAP Encryption Access Project
-License: GPL-3+ OpenSSL
+License: GPL-3+ with OpenSSL exception
This package is released under the GNU GPL, version 3 or a later revision.
For further details see the COPYING file.
.