Skip to content

Commit

Permalink
Remove GPL License
Browse files Browse the repository at this point in the history
It's moot, since the MIT License is GPL compatible
  • Loading branch information
sindresorhus committed Mar 15, 2012
1 parent 551c901 commit 3fbb996
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 6 deletions.
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion grunt.js
Expand Up @@ -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(", ") %> */'
},
Expand Down
2 changes: 1 addition & 1 deletion index.html
Expand Up @@ -209,7 +209,7 @@ <h3>The Future</h3>
</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>
Expand Down
2 changes: 0 additions & 2 deletions package.json
Expand Up @@ -35,8 +35,6 @@
},
"licenses": [{
"type": "MIT"
},{
"type": "GPL"
}],
"devDependencies": {
"grunt": "~0.2.15"
Expand Down

1 comment on commit 3fbb996

@honza
Copy link

@honza honza commented on 3fbb996 Mar 15, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

YES

Please sign in to comment.