This commit adds a mailmap file to make it easier to associate
contrimutors who use different email addresses or names to commit to
The reasoning behind the license change is to allow qaul.net to be
published on the Apple iOS app store. Because our code repository is
licensed under the AGPL-3.0, we need to use the section 7 "additional
permissions" section of the AGPL to add this excemption to the
license. This is a change that all current copyright holders (CCed in
the patch mail) need to sign-off on.
Signed-off-by: Katharina Fey <email@example.com>
Please reply to this email (and the list!) with your own signed-off-my
line, similar to the one that's present in the actual commit text
above! When everybody CC'ed to this email has signed off on the
change I will merge the commit into master with the appropriate
signatures added after mine.
.mailmap | 6 ++++++README.md | 22 +++++++++++++++++-----
2 files changed, 23 insertions(+), 5 deletions(-)
create mode 100644 .mailmap
diff --git a/.mailmap b/.mailmap
new file mode 100644
--- /dev/null+++ b/.mailmap
@@ -0,0 +1,6 @@
+Katharina Fey <firstname.lastname@example.org>+Math Jud <email@example.com>+Lux <firstname.lastname@example.org> <email@example.com>+Lux <firstname.lastname@example.org> Lukas Kohler <email@example.com>+<firstname.lastname@example.org> <email@example.com>+Jess 3Jane <firstname.lastname@example.org> jess 3jane
diff --git a/README.md b/README.md
index 8cc4d0b..d3000ec 100644
--- a/README.md+++ b/README.md
@@ -54,8 +54,20 @@ Documentation is avaliable [here](https://docs.qaul.net).
-qaul.net is free and open source software licensed under the-[GNU Affero General Public License version 3 or later](licenses/gpl-3.0.md).--To see all external code's licenses used in this project please -visit the [`licenses` directory](licenses).+qaul.net is free and open source software licensed under the [GNU+Affero General Public License version 3 or+later](licenses/gpl-3.0.md).++**Additional Permissions:** For Submission to the Apple App Store:+Provided that you are otherwise in compliance with the AGPLv3 for each+covered work you convey (including without limitation making the+Corresponding Source available in compliance with Section 6 of the+AGPLv3), the qaul.net developers also grant you the additional+permission to convey through the Apple App Store non-source executable+versions of the Program as incorporated into each applicable covered+work as Executable Versions only under the Mozilla Public License+version 2.0.++A copy of both the AGPL-3.0 and MPL-2.0 license texts are included in+this repository, along other external licenses for third-party code,+and can be found in the [licenses](licenses) directory.