Skip to content

Commit

Permalink
Switch license
Browse files Browse the repository at this point in the history
  • Loading branch information
NeXTs committed Feb 29, 2016
1 parent 0211baf commit 8accbc2
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 20 deletions.
22 changes: 6 additions & 16 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,21 +1,11 @@
The MIT License (MIT)
The GPLv3 License (GPLv3)

Copyright (c) 2015 Denis Lukov

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:
Commercial license

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
If you want to use Clusterize.js to develop commercial sites, themes, projects, and applications, the Commercial license is the appropriate license. With this option, your source code is kept proprietary. Purchase a Clusterize.js Commercial License at uplabs.com/posts/clusterize-js-commercial-license

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.
Open source license

If you are creating an open source application under a license compatible with the GNU GPL license v3, you may use this project under the terms of the GPLv3.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
"authors": [
"Denis Lukov"
],
"license": "MIT",
"license": "GPLv3",
"homepage": "https://github.com/NeXTs/Clusterize.js"
}
2 changes: 1 addition & 1 deletion clusterize.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*! Clusterize.js - v0.15.0 - 2015-12-02
* http://NeXTs.github.com/Clusterize.js/
* Copyright (c) 2015 Denis Lukov; Licensed MIT */
* Copyright (c) 2015 Denis Lukov; Licensed GPLv3 */

;(function(name, definition) {
if (typeof module != 'undefined') module.exports = definition();
Expand Down
2 changes: 1 addition & 1 deletion clusterize.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"cluster"
],
"author": "Denis Lukov",
"license": "MIT",
"license": "GPLv3",
"bugs": {
"url": "https://github.com/NeXTs/Clusterize.js/issues"
},
Expand Down

0 comments on commit 8accbc2

Please sign in to comment.