Skip to content

Commit

Permalink
Revert RainLoop merge that caused MIT vs AGPL
Browse files Browse the repository at this point in the history
  • Loading branch information
the-djmaze committed Sep 1, 2022
1 parent a146d73 commit 17fa031
Show file tree
Hide file tree
Showing 6 changed files with 667 additions and 27 deletions.
682 changes: 661 additions & 21 deletions LICENSE

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ And don't forget to read the [RainLoop documentation](https://www.rainloop.net/d
## License

**SnappyMail** is released under
**MIT License**.
https://choosealicense.com/licenses/mit/
**GNU AFFERO GENERAL PUBLIC LICENSE Version 3 (AGPL)**.
http://www.gnu.org/licenses/agpl-3.0.html

Copyright (c) 2020 - 2022 SnappyMail
Copyright (c) 2013 - 2021 RainLoop
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ abstract class AbstractPlugin
RELEASE = '2020-11-01',
REQUIRED = '2.0.0',
CATEGORY = 'General',
LICENSE = 'MIT',
LICENSE = 'AGPL v3',
DESCRIPTION = '';

/**
Expand Down
2 changes: 1 addition & 1 deletion tasks/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ exports.copy = (sFile, sNewFile, done) => {
done();
};

exports.getHead = () => config.head.mit;
exports.getHead = () => config.head.agpl;

exports.cleanStatic = () => del(config.paths.static);
2 changes: 1 addition & 1 deletion tasks/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const path = require('path');

const config = {
head: {
mit: '/* SnappyMail Webmail (c) SnappyMail | Licensed under MIT */'
agpl: '/* SnappyMail Webmail (c) SnappyMail | Licensed under AGPL v3 */'
},
devVersion: '0.0.0',

Expand Down
2 changes: 1 addition & 1 deletion tasks/rollup.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* SnappyMail Webmail (c) SnappyMail Team | Licensed under MIT */
/* SnappyMail Webmail (c) SnappyMail Team | Licensed under AGPL v3 */
const rollup2 = require('gulp-rollup-2');
const includePaths = require('rollup-plugin-includepaths');
const externalGlobals = require('rollup-plugin-external-globals');
Expand Down

0 comments on commit 17fa031

Please sign in to comment.