Skip to content

Commit

Permalink
Add new LICENSE.md with updated copyright. Remote old Resources/meta/…
Browse files Browse the repository at this point in the history
…LICENSE.

Detailed changes:
- Created a simple, markdown-styled version of the MIT license.
- Added Liip website to license (ttps://www.liip.ch/)
- Added GitHub Contributors to license copyright
- Contributors link: https://github.com/liip/LiipImagineBundle/graphs/contributors

Previous, squashed commits include:
1. Add new root-level LICENSE.md to project
2. Remove Resources/meta/LICESNE (old location of license)

added avalance original copyright notice
  • Loading branch information
robfrawley committed Sep 7, 2016
1 parent 0cd8678 commit ad7bb95
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 19 deletions.
22 changes: 22 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@

# The MIT License (MIT)

- **Copyright © 2010-2016 Liip & Contributors <[liip/LiipImagineBundle](https://github.com/liip/LiipImagineBundle/graphs/contributors)>**
- **Copyright © 2004-2011 Bulat Shakirzyanov <[avalanche123/AvalancheImagineBundle](https://github.com/avalanche123/AvalancheImagineBundle)>**

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.
19 changes: 0 additions & 19 deletions Resources/meta/LICENSE

This file was deleted.

0 comments on commit ad7bb95

Please sign in to comment.