From be0842c66dbc731eb7215a6bfab2a00f5f5fd7e6 Mon Sep 17 00:00:00 2001 From: Sven Neuhaus Date: Wed, 14 Feb 2018 15:47:17 +0100 Subject: [PATCH 1/3] add license to package.json --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index b9cac6c82..624e45aec 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,7 @@ "name": "cryptpad", "description": "realtime collaborative visual editor with zero knowlege server", "version": "1.25.0", + "license": "AGPL-3.0-only", "dependencies": { "chainpad-server": "^2.0.0", "express": "~4.10.1", From c409cac2805c3dae671d47a1b07912c66cf93dfd Mon Sep 17 00:00:00 2001 From: Sven Neuhaus Date: Thu, 22 Feb 2018 13:03:53 +0100 Subject: [PATCH 2/3] changed to AGPL-3.0-or-later --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 624e45aec..f8fec3fd7 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "cryptpad", "description": "realtime collaborative visual editor with zero knowlege server", "version": "1.25.0", - "license": "AGPL-3.0-only", + "license": "AGPL-3.0-or-later", "dependencies": { "chainpad-server": "^2.0.0", "express": "~4.10.1", From d2b3e078d53f7e357aeaf41bd4bb8e894b416b14 Mon Sep 17 00:00:00 2001 From: Sven Neuhaus Date: Thu, 22 Feb 2018 13:05:00 +0100 Subject: [PATCH 3/3] updated version to resolve conflict --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f8fec3fd7..484bd77cf 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cryptpad", "description": "realtime collaborative visual editor with zero knowlege server", - "version": "1.25.0", + "version": "1.26.0", "license": "AGPL-3.0-or-later", "dependencies": { "chainpad-server": "^2.0.0",