From 289886021add9711c052ccf66859b6370a9193a5 Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周六, 01 2月 2020 18:00:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into feature/pc_identifiers

---
 LICENSE |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/LICENSE b/LICENSE
index d0813a9..118004a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,5 @@
-Copyright (c) 2014, 
+Copyright (c) 2014, 2019 Gabriele Contini et al.
+
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -11,9 +12,9 @@
   this list of conditions and the following disclaimer in the documentation
   and/or other materials provided with the distribution.
 
-* Neither the name of the {organization} nor the names of its
+* Neither the name of "open-license-manager" nor the names of its
   contributors may be used to endorse or promote products derived from
-  this software without specific prior written permission.
+  this software without specific prior written permission. 
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

--
Gitblit v1.9.1