Skip to content

Commit

Permalink
Merge pull request #2 from Kinto/2-licence
Browse files Browse the repository at this point in the history
Change the license
  • Loading branch information
n1k0 committed Sep 7, 2015
2 parents ec197a9 + 35b866b commit 7097a50
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
13 changes: 13 additions & 0 deletions LICENCE
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Copyright 2012 - Mozilla Foundation

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"indexeddb"
],
"author": "Nicolas Perriault <nperriault@mozilla.com>",
"license": "MPL-2.0",
"license": "Apache-2.0",
"bugs": {
"url": "https://github.com/Kinto/kinto.js/issues"
},
Expand Down

0 comments on commit 7097a50

Please sign in to comment.