Explorar o código

Merge branch 'master' of github.com:taylor001/crown

Daniele Bartolini %!s(int64=10) %!d(string=hai) anos
pai
achega
9d89a28326
Modificáronse 1 ficheiros con 26 adicións e 1 borrados
  1. 26 1
      README.md

+ 26 - 1
README.md

@@ -98,7 +98,7 @@ A number of tools can be found at https://github.com/taylor001/crown-tools
 Contact
 -------
 
-[@aa_dani_bart](https://twitter.com/aa_dani_bart)
+Daniele Bartolini ([@aa_dani_bart](https://twitter.com/aa_dani_bart))
 
 Contributors
 ------------
@@ -108,3 +108,28 @@ In alphabetical order.
 Michele Rossi ([@mikymod](https://github.com/mikymod))  
 Simone Boscaratto ([@Xed89](https://github.com/Xed89))
 
+License
+-------
+
+	Copyright (c) 2012-2015 Daniele Bartolini and individual contributors.
+
+	Permission is hereby granted, free of charge, to any person
+	obtaining a copy of this software and associated documentation
+	files (the "Software"), to deal in the Software without
+	restriction, including without limitation the rights to use,
+	copy, modify, merge, publish, distribute, sublicense, and/or sell
+	copies of the Software, and to permit persons to whom the
+	Software is furnished to do so, subject to the following
+	conditions:
+
+	The above copyright notice and this permission notice shall be
+	included in all copies or substantial portions of the Software.
+
+	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+	EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+	OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+	NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+	HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+	WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+	FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+	OTHER DEALINGS IN THE SOFTWARE.