diff options
| author | zotlabs <mike@macgirvin.com> | 2017-04-26 20:11:12 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-04-26 20:11:12 -0700 |
| commit | 88149f56bb2d2fb8f4a02cc320e5ba83435d8acc (patch) | |
| tree | 8fd1c67cc364af4dee4ce81cd37befe4a9857e44 /images/emoji/README | |
| parent | 6fcfab34883e5e93e9438ed4872de304e22b0f00 (diff) | |
| parent | 1c304eb8ba5395e62c0245133d58a3f00adaeaac (diff) | |
| download | volse-hubzilla-88149f56bb2d2fb8f4a02cc320e5ba83435d8acc.tar.gz volse-hubzilla-88149f56bb2d2fb8f4a02cc320e5ba83435d8acc.tar.bz2 volse-hubzilla-88149f56bb2d2fb8f4a02cc320e5ba83435d8acc.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'images/emoji/README')
| -rw-r--r-- | images/emoji/README | 2 |
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 |