pangea
/
django-orchestra
7
0
Fork 0
Code Issues 1 Pull Requests 2 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/glic3rinu/django-orchestra

This commit is contained in:
Marc 2014-11-16 18:39:52 +00:00
parent 1c09e34855 efbd7734c0
commit 7479c47852
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
README.md
View File

@ -76,7 +76,7 @@ If you are planing to do some development or perhaps just checking out this proj
License License
------- -------
Copyright (c) 2014 Marc Aymerich and individual contributors Copyright (c) 2014 - Marc Aymerich and individual contributors.
All Rights Reserved. All Rights Reserved.
Django-orchestra is licensed under The BSD License (3 Clause, also known as 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 Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met: modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
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
* Redistributions in binary form must reproduce the above copyright documentation and/or other materials provided with the distribution.
notice, this list of conditions and the following disclaimer in the * Neither the name of Marc Aymerich, nor the
documentation and/or other materials provided with the distribution. names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.
* 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" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,