Skip to content

Commit

Permalink
Merge pull request #191 from SparkPost/mit-lic
Browse files Browse the repository at this point in the history
Updating License
  • Loading branch information
Tom Mairs committed Jan 14, 2021
2 parents 60efd20 + f9b970d commit fe98775
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 11 deletions.
27 changes: 17 additions & 10 deletions LICENSE.txt
@@ -1,13 +1,20 @@
Copyright 2014 Message Systems, Inc. or its affiliates. All Rights Reserved.
Copyright 2014 Message Systems, Inc. or its affiliates.

Licensed under the Apache License, Version 2.0 (the "License").
You may not use this software except in compliance with the License.
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:

A copy of the License is located at
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

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

or in the "license" file accompanying this software. This file 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.
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.
2 changes: 1 addition & 1 deletion composer.json
@@ -1,7 +1,7 @@
{
"name": "sparkpost/sparkpost",
"description": "Client library for interfacing with the SparkPost API.",
"license": "Apache 2.0",
"license": "MIT",
"authors": [
{
"name": "SparkPost"
Expand Down

0 comments on commit fe98775

Please sign in to comment.