Browse files

fixed LICENSE

  • Loading branch information...
1 parent 81fbf11 commit ccd6c1a5dd5000420cddcbae84814593b50b8b64 @saxix committed Sep 3, 2012
Showing with 2 additions and 10 deletions.
  1. +2 −10 LICENSE
View
12 LICENSE
@@ -1,20 +1,12 @@
-Copyright (c) Stefano Apostolico and individual contributors.
-All rights reserved.
+* Copyright (c) 2010, Stefano Apostolico (s.apostolico@gmail.com)
+* Dual licensed under the MIT or GPL Version 2 licenses.
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
- 2. 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.
-
- 3. Neither the name of Django 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, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

0 comments on commit ccd6c1a

Please sign in to comment.