aboutsummaryrefslogtreecommitdiffstats
path: root/images
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-04-26 14:20:16 +0200
committerMario Vavti <mario@mariovavti.com>2017-04-26 14:20:16 +0200
commitd1c84ad9f0884bb49c7840ac59f5756b16cb7aef (patch)
tree159d3ea820598e16712519ffc6274615b778108b /images
parentc904bd3a628e4bf3c2420ee314277da69828c3b2 (diff)
parentc39a6800968f7ac017d215306b55d5b6bb39ded6 (diff)
downloadvolse-hubzilla-d1c84ad9f0884bb49c7840ac59f5756b16cb7aef.tar.gz
volse-hubzilla-d1c84ad9f0884bb49c7840ac59f5756b16cb7aef.tar.bz2
volse-hubzilla-d1c84ad9f0884bb49c7840ac59f5756b16cb7aef.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
Diffstat (limited to 'images')
-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