Skip to content

Commit

Permalink
Updated copyright year and added new contributor
Browse files Browse the repository at this point in the history
  • Loading branch information
bhaggs committed Feb 13, 2018
1 parent 2f786b0 commit ed8160a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions LICENSE
@@ -1,4 +1,4 @@
Copyright (c) 2017 Twitter, Inc and other contributors Copyright (c) 2018 Twitter, Inc and other contributors


Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal
Expand All @@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 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 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
3 changes: 2 additions & 1 deletion README.md
Expand Up @@ -344,6 +344,7 @@ However, we consider the guide a bit onerous and as a project, will accept a men


## Committers and Contributors ## Committers and Contributors
* Bryan Haggerty (Twitter) * Bryan Haggerty (Twitter)
* Nathan Downs (Twitter)
* Tom Wuttke (ex-Twitter) * Tom Wuttke (ex-Twitter)
* Andrea Giammarchi (ex-Twitter) * Andrea Giammarchi (ex-Twitter)
* Joen Asmussen (WordPress) * Joen Asmussen (WordPress)
Expand All @@ -356,7 +357,7 @@ The rules for contributing are available in the `CONTRIBUTING.md` file.
Thank you to all of our [contributors](https://github.com/twitter/twemoji/graphs/contributors). Thank you to all of our [contributors](https://github.com/twitter/twemoji/graphs/contributors).


## License ## License
Copyright 2017 Twitter, Inc and other contributors Copyright 2018 Twitter, Inc and other contributors


Code licensed under the MIT License: http://opensource.org/licenses/MIT Code licensed under the MIT License: http://opensource.org/licenses/MIT


Expand Down

0 comments on commit ed8160a

Please sign in to comment.