aboutsummaryrefslogtreecommitdiffstats
path: root/images/emoji/README
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-06-04 05:45:53 -0400
committerAndrew Manning <tamanning@zoho.com>2016-06-04 05:45:53 -0400
commitc08f428b5e7979e87250c2b0a30cd16344b395d9 (patch)
tree4da053975141628a0ead27f5a50606e9aec4fc27 /images/emoji/README
parentb93e398674b375a3b14718fc6dd2a815aad9b387 (diff)
parent20a79c7acf1850f431f4fd52972ea0b6acf8ce0c (diff)
downloadvolse-hubzilla-c08f428b5e7979e87250c2b0a30cd16344b395d9.tar.gz
volse-hubzilla-c08f428b5e7979e87250c2b0a30cd16344b395d9.tar.bz2
volse-hubzilla-c08f428b5e7979e87250c2b0a30cd16344b395d9.zip
Merge remote-tracking branch 'upstream/dev' into wiki
Diffstat (limited to 'images/emoji/README')
-rw-r--r--images/emoji/README2
1 files changed, 2 insertions, 0 deletions
diff --git a/images/emoji/README b/images/emoji/README
new file mode 100644
index 000000000..ab478b753
--- /dev/null
+++ b/images/emoji/README
@@ -0,0 +1,2 @@
+These files supplied by emojione. License is CC BY 4.0. Attribution is required for commercial use.
+See http://emojione.com