diff options
| author | Marc Cornellà <marc.cornella@live.com> | 2016-01-04 17:30:11 +0100 |
|---|---|---|
| committer | Marc Cornellà <marc.cornella@live.com> | 2016-01-04 17:30:11 +0100 |
| commit | 686e46025890cba38d2cb7ad7cc229bf6beeba57 (patch) | |
| tree | 1ea77417df0ebf1d5b9343ee72fd8cdb69dbe73a | |
| parent | f558a460c289a41811e0c4b89f04d539c66224a1 (diff) | |
| parent | 03cc1f74f37c538dbc774051165bdd24ab05e586 (diff) | |
| download | zsh-686e46025890cba38d2cb7ad7cc229bf6beeba57.tar.gz zsh-686e46025890cba38d2cb7ad7cc229bf6beeba57.tar.bz2 zsh-686e46025890cba38d2cb7ad7cc229bf6beeba57.zip | |
Merge branch 'sachin21-a_happy_new_year'
Close #4740
| -rw-r--r-- | MIT-LICENSE.txt | 13 | ||||
| -rw-r--r-- | README.markdown | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/MIT-LICENSE.txt b/MIT-LICENSE.txt index dfbd90035..42f607f5d 100644 --- a/MIT-LICENSE.txt +++ b/MIT-LICENSE.txt @@ -1,6 +1,7 @@ -The MIT License +The MIT License (MIT) -Copyright (c) 2009-2015 Robby Russell and contributors (see https://github.com/robbyrussell/oh-my-zsh/contributors) +Copyright (c) 2009-2016 Robby Russell and contributors +See the full list at https://github.com/robbyrussell/oh-my-zsh/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 @@ -9,13 +10,13 @@ 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 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. +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.markdown b/README.markdown index 9d7210f77..33128ef97 100644 --- a/README.markdown +++ b/README.markdown @@ -210,4 +210,4 @@ We have [stickers](http://shop.planetargon.com/products/ohmyzsh-stickers-set-of- ## License -Oh My Zsh is released under the [MIT license](https://github.com/robbyrussell/oh-my-zsh/blob/master/MIT-LICENSE.txt). +Oh My Zsh is released under the [MIT license](MIT-LICENSE.txt). |