aboutsummaryrefslogtreecommitdiffstats
path: root/images/emoji/README
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-03-05 16:32:53 -0800
committerzotlabs <mike@macgirvin.com>2017-03-05 16:32:53 -0800
commit98ccdf65fb6878adcc62b7ffc0c9f6125f96cefa (patch)
treeea82dbbd45ecf00b6d9f4d850b04bfa77837cbae /images/emoji/README
parentc533c62c640cf081c44bf0489680ee3be3e45ecb (diff)
parent4c0c153b8f23a2e6cbd037591af982232cb77989 (diff)
downloadvolse-hubzilla-98ccdf65fb6878adcc62b7ffc0c9f6125f96cefa.tar.gz
volse-hubzilla-98ccdf65fb6878adcc62b7ffc0c9f6125f96cefa.tar.bz2
volse-hubzilla-98ccdf65fb6878adcc62b7ffc0c9f6125f96cefa.zip
Merge branch 'dev' into red
Diffstat (limited to 'images/emoji/README')
-rw-r--r--images/emoji/README2
1 files changed, 0 insertions, 2 deletions
diff --git a/images/emoji/README b/images/emoji/README
deleted file mode 100644
index ab478b753..000000000
--- a/images/emoji/README
+++ /dev/null
@@ -1,2 +0,0 @@
-These files supplied by emojione. License is CC BY 4.0. Attribution is required for commercial use.
-See http://emojione.com