Merge pull request #61 from kasper/amend-license

Amend license regarding the Phoenix icon assets
kasper · Dec 10, 2015 · 06d0aac · 06d0aac
2 parents 1291e52 + 66a8327
commit 06d0aac
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ Changelog
 
 Release: dd.mm.yyyy
 
+### Changes
+
+- Amend license regarding the Phoenix icon assets contributed by Jason Milkins for not being under the MIT License ([#61](https://github.com/kasper/phoenix/pull/61)).
+
 ### Bug Fixes
 
 - Support shells (e.g. Fish) that do not support `-cl` option shorthand in preprocessing ([#57](https://github.com/kasper/phoenix/pull/57)).

diff --git a/LICENSE.md b/LICENSE.md
@@ -3,6 +3,8 @@ License
 
 Released under the MIT License. Phoenix was originally authored by Steven Degutis. As it stands now, it has been rewritten from the ground up by Kasper Hirvikoski. It is currently developed by Kasper Hirvikoski and Jason Milkins. This software consists of contributions made by many individuals.
 
+Please note that the app icon assets found in `Phoenix/Images.xcassets/AppIcon.appiconset/` have been solely licensed by Jason Milkins for this project (https://github.com/kasper/phoenix/) and they are not under the MIT License. You may only use these assets in direct association with this parent project — such as with forks intended for contributing.
+
 > Copyright (c) 2015 Kasper Hirvikoski  
 > Copyright (c) 2014 Jason Milkins  
 > Copyright (c) 2013 Steven Degutis