Skip to content

Commit

Permalink
Merge pull request #7900 from electron/more-license-clarification
Browse files Browse the repository at this point in the history
More license section clarification and update copyright year
  • Loading branch information
lee-dohm committed Nov 7, 2016
2 parents b6ece7d + e49af23 commit 4159a6a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion LICENSE
@@ -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
a copy of this software and associated documentation files (the
Expand Down
6 changes: 2 additions & 4 deletions README.md
Expand Up @@ -82,8 +82,6 @@ for a community maintained list of useful example apps, tools and resources.

## 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).

*Code license:* [MIT](https://github.com/electron/electron/blob/master/LICENSE)
When using the Electron or other GitHub logos, be sure to follow the [GitHub logo guidelines](https://github.com/logos).

0 comments on commit 4159a6a

Please sign in to comment.