From 6c3e09a571f407d2bd691c8e5cd1cc43b7e4d022 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 10 10月 2020 22:01:05 +0800
Subject: [PATCH] Merge branch 'develop' of https://github.com/open-license-manager/open-license-manager.git into develop

---
 LICENSE |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/LICENSE b/LICENSE
index d16a191..b57fa6f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,5 @@
-Copyright (c) 2014, rillf
+Copyright (c) 2014, 2020 Gabriele Contini et al.
+
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -11,7 +12,7 @@
   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. 
 

--
Gitblit v1.9.1