Permalink
Browse files

Remove GPL License

It's moot, since the MIT License is GPL compatible
  • Loading branch information...
1 parent 551c901 commit 3fbb9968dd065fb336aa4ceface0feb5b902c554 @sindresorhus sindresorhus committed Mar 15, 2012
Showing with 4 additions and 6 deletions.
  1. +2 −2 README.md
  2. +1 −1 grunt.js
  3. +1 −1 index.html
  4. +0 −2 package.json
View
@@ -18,5 +18,5 @@ We are also attempting to get as much unit test coverage as possible. For this r
[Addy Osmani](https://github.com/addyosmani) (lead), [Andrée Hansson](https://github.com/peol), [Sindre Sorhus](https://github.com/sindresorhus)
## License
-Copyright (c) 2012 Addy Osmani
-Licensed under the MIT and GPL licenses
+(c) Addy Osmani
+[MIT License](http://en.wikipedia.org/wiki/MIT_License)
View
@@ -7,7 +7,7 @@ config.init({
'<%= template.today("yyyy-mm-dd") %>\n' +
'<%= pkg.homepage ? "* " + pkg.homepage + "\n" : "" %>' +
'* (c) <%= pkg.author.name %>;' +
- ' Licensed <%= _.pluck(pkg.licenses, "type").join(", ") %>\n' +
+ ' <%= _.pluck(pkg.licenses, "type").join(", ") %> License\n' +
'* Created by: <%= _.pluck(pkg.maintainers, "name").join(", ") %>\n' +
'* Contributors: <%= _.pluck(pkg.contributors, "name").join(", ") %> */'
},
View
@@ -209,7 +209,7 @@
</ul>
<p>&nbsp;</p>
<h3>Team, License &amp; Contribution Guide</h3>
-<p>basket.js is released under an MIT/GPL license and is currently maintained by <a href="https://github.com/addyosmani">Addy Osmani</a>, <a href="https://github.com/sindresorhus">Sindre Sorhus</a> and <a href="https://github.com/peol">Andrée Hansson</a>. We would also like to extend our thanks to <a href="https://github.com/rwldrn">Rick Waldron</a> for the optimizations he suggested for improving the project.</p>
+<p>basket.js is released under an <a href="http://en.wikipedia.org/wiki/MIT_License">MIT License</a> and is currently maintained by <a href="https://github.com/addyosmani">Addy Osmani</a>, <a href="https://github.com/sindresorhus">Sindre Sorhus</a> and <a href="https://github.com/peol">Andrée Hansson</a>. We would also like to extend our thanks to <a href="https://github.com/rwldrn">Rick Waldron</a> for the optimizations he suggested for improving the project.</p>
<p>For more information on our style-guide and how to get involved with basket.js, please see the README in our project <a href="http://github.com/addyosmani/basket.js">repo</a>.</p>
</div>
</div>
View
@@ -35,8 +35,6 @@
},
"licenses": [{
"type": "MIT"
- },{
- "type": "GPL"
}],
"devDependencies": {
"grunt": "~0.2.15"

1 comment on commit 3fbb996

@honza
honza commented on 3fbb996 Mar 15, 2012

YES

Please sign in to comment.