Browse files

Combine Flask product and artwork license into a single file

  • Loading branch information...
1 parent 499eced commit ddcceb492196d4c92ffd49c85975259d4a5bb36b @kamalgill committed Oct 17, 2010
Showing with 24 additions and 23 deletions.
  1. +0 −23 licenses/Flask-artwork-license.txt
  2. +24 −0 licenses/Flask-license.txt
View
23 licenses/Flask-artwork-license.txt
@@ -1,23 +0,0 @@
-Flask Artwork License
-
-Copyright (c) 2010 by Armin Ronacher.
-
-Some rights reserved.
-
-This logo or a modified version may be used by anyone to refer to the Flask
-project, but does not indicate endorsement by the project.
-
-Redistribution and use in source (the SVG file) and binary forms (rendered
-PNG files etc.) of the image, with or without modification, are permitted
-provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright
- notice and this list of conditions.
-
- * The names of the contributors to the Flask software (see AUTHORS)
- may not be used to endorse or promote products derived from this
- software without specific prior written permission.
-
-Note: we would appreciate that you make the image a link to
-http://flask.pocoo.org/ if you use it on a web page.
-
View
24 licenses/Flask-license.txt
@@ -32,3 +32,27 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Flask Artwork License
+
+Copyright (c) 2010 by Armin Ronacher.
+
+Some rights reserved.
+
+This logo or a modified version may be used by anyone to refer to the Flask
+project, but does not indicate endorsement by the project.
+
+Redistribution and use in source (the SVG file) and binary forms (rendered
+PNG files etc.) of the image, with or without modification, are permitted
+provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright
+ notice and this list of conditions.
+
+ * The names of the contributors to the Flask software (see AUTHORS)
+ may not be used to endorse or promote products derived from this
+ software without specific prior written permission.
+
+Note: we would appreciate that you make the image a link to
+http://flask.pocoo.org/ if you use it on a web page.
+

0 comments on commit ddcceb4

Please sign in to comment.