summaryrefslogtreecommitdiffstats
path: root/NOTICE.txt
diff options
context:
space:
mode:
authoresethna <eric@spinpunch.com>2015-09-24 14:01:46 -0600
committeresethna <eric@spinpunch.com>2015-09-24 14:01:46 -0600
commit737e48dce3dc8d839d0914f6614ae86e5ee545a1 (patch)
tree9e38700cb7d4be42c310fe6f7234d5bd7268b858 /NOTICE.txt
parentca8efc66c31ad2d5067aaca68684386bd1a479f0 (diff)
downloadchat-737e48dce3dc8d839d0914f6614ae86e5ee545a1.tar.gz
chat-737e48dce3dc8d839d0914f6614ae86e5ee545a1.tar.bz2
chat-737e48dce3dc8d839d0914f6614ae86e5ee545a1.zip
Update NOTICE.txt to include emoji license info V3
Tweaked the license info as per chat with Ian
Diffstat (limited to 'NOTICE.txt')
-rw-r--r--NOTICE.txt9
1 files changed, 6 insertions, 3 deletions
diff --git a/NOTICE.txt b/NOTICE.txt
index 6e9ad7699..dafc6d257 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -725,9 +725,14 @@ Legal Terms
http://www.freetype.org
+--- end of FTL.TXT ---
+
---
-This product contains a modified portion of emoji artwork by Apple Inc. and other contributors.
+This product contains a modified portion of 'gemoji', a collection of emoji images and names by Apple Inc. and other contributors.
+
+* HOMEPAGE:
+ * https://github.com/github/gemoji/blob/master/LICENSE
* LICENSE:
@@ -762,5 +767,3 @@ PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
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.
-
---- end of FTL.TXT ---