686e46025890cba38d2cb7ad7cc229bf6beeba57

Author
Marc Cornellà <marc.cornella@live.com>
Committer
Marc Cornellà <marc.cornella@live.com>
Date

Message

Merge branch 'sachin21-a_happy_new_year'

Close #4740

Diff

 1diff --git a/MIT-LICENSE.txt b/MIT-LICENSE.txt
 2index dfbd90035cc448b0c75d935ef98d2144cf49fc84..42f607f5d0015d99a4554b62ba67647e62b511f3 100644
 3--- a/MIT-LICENSE.txt
 4+++ b/MIT-LICENSE.txt
 5@@ -1,6 +1,7 @@
 6-The MIT License
 7+The MIT License (MIT)
 8 
 9-Copyright (c) 2009-2015 Robby Russell and contributors (see https://github.com/robbyrussell/oh-my-zsh/contributors)
10+Copyright (c) 2009-2016 Robby Russell and contributors
11+See the full list at https://github.com/robbyrussell/oh-my-zsh/contributors
12 
13 Permission is hereby granted, free of charge, to any person obtaining a copy
14 of this software and associated documentation files (the "Software"), to deal
15@@ -9,13 +10,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
16 copies of the Software, and to permit persons to whom the Software is
17 furnished to do so, subject to the following conditions:
18 
19-The above copyright notice and this permission notice shall be included in
20-all copies or substantial portions of the Software.
21+The above copyright notice and this permission notice shall be included in all
22+copies or substantial portions of the Software.
23 
24 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
25 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
26 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
27 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
28 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
29-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
30-THE SOFTWARE.
31+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
32+SOFTWARE.
33diff --git a/README.markdown b/README.markdown
34index 9d7210f778e190c035c968acae350fc26cef4192..33128ef973025d1040cd2f1e8341a900677bbe38 100644
35--- a/README.markdown
36+++ b/README.markdown
37@@ -210,4 +210,4 @@ We have [stickers](http://shop.planetargon.com/products/ohmyzsh-stickers-set-of-
38 
39 ## License
40 
41-Oh My Zsh is released under the [MIT license](https://github.com/robbyrussell/oh-my-zsh/blob/master/MIT-LICENSE.txt).
42+Oh My Zsh is released under the [MIT license](MIT-LICENSE.txt).