Permalink
Browse files

Reformat & rename license file

  • Loading branch information...
1 parent c21a605 commit c935fe130611e2a255c9393f8856ce915682354b @billinghamj billinghamj committed Jun 23, 2016
Showing with 19 additions and 24 deletions.
  1. +1 −1 JSONModel.podspec
  2. +18 −0 LICENSE
  3. +0 −23 LICENSE_jsonmodel.txt
View
@@ -4,7 +4,7 @@ Pod::Spec.new do |s|
s.summary = "Magical Data Modelling Framework for JSON. Create rapidly powerful, atomic and smart data model classes."
s.homepage = "http://www.jsonmodel.com"
- s.license = { :type => 'MIT', :file => 'LICENSE_jsonmodel.txt' }
+ s.license = { :type => 'MIT', :file => 'LICENSE' }
s.author = { "Marin Todorov" => "touch-code-magazine@underplot.com" }
s.source = { :git => "https://github.com/JSONModel/JSONModel.git", :tag => "1.2.0" }
View
@@ -0,0 +1,18 @@
+Copyright (c) 2012-2016 Marin Todorov and JSONModel contributors
+
+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:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+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.
View
@@ -1,23 +0,0 @@
-JSONModel
-
-Copyright (c) 2012-2014 Marin Todorov, Underplot ltd.
-This code is distributed under the terms and conditions of the MIT 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:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-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.
-
-The MIT License in plain English: http://www.touch-code-magazine.com/JSONModel/MITLicense

0 comments on commit c935fe1

Please sign in to comment.