From 7e90ece03e823029b26dd1cd1ae97663e6aecd83 Mon Sep 17 00:00:00 2001 From: Marc Aymerich Date: Sun, 16 Nov 2014 15:45:59 +0100 Subject: [PATCH 1/2] Update README.md --- README.md | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index a6ba54bd..25b5dffa 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ If you are planing to do some development or perhaps just checking out this proj License ------- -Copyright (c) 2014 Marc Aymerich and individual contributors +Copyright (c) 2014 - Marc Aymerich and individual contributors. All Rights Reserved. Django-orchestra is licensed under The BSD License (3 Clause, also known as @@ -88,17 +88,14 @@ http://www.opensource.org/licenses/BSD-3-Clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - * Neither the name of Ask Solem, nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. +* Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +* Neither the name of Ask Solem, 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 IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, From efbd7734c044b79528f8a488a3abe5801f700dd8 Mon Sep 17 00:00:00 2001 From: Marc Aymerich Date: Sun, 16 Nov 2014 15:47:11 +0100 Subject: [PATCH 2/2] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 25b5dffa..fb18a9e9 100644 --- a/README.md +++ b/README.md @@ -93,7 +93,7 @@ modification, are permitted provided that the following conditions are met: * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -* Neither the name of Ask Solem, nor the +* Neither the name of Marc Aymerich, nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.