Merge pull request #7900 from electron/more-license-clarification

More license section clarification and update copyright year
This commit is contained in:
Lee Dohm 2016-11-07 14:57:46 -08:00 committed by GitHub
commit 4159a6a41d
2 changed files with 3 additions and 5 deletions

View file

@ -1,4 +1,4 @@
Copyright (c) 2016 GitHub Inc. Copyright (c) 2013-2016 GitHub Inc.
Permission is hereby granted, free of charge, to any person obtaining Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the a copy of this software and associated documentation files (the

View file

@ -82,8 +82,6 @@ for a community maintained list of useful example apps, tools and resources.
## License ## License
© 2016 Github, Inc. [MIT](https://github.com/electron/electron/blob/master/LICENSE)
When using the Electron or GitHub logos, be sure to follow the [GitHub logo guidelines](https://github.com/logos). When using the Electron or other GitHub logos, be sure to follow the [GitHub logo guidelines](https://github.com/logos).
*Code license:* [MIT](https://github.com/electron/electron/blob/master/LICENSE)