diff options
author | Alex S <alex.strizhakov@gmail.com> | 2019-04-02 19:16:29 +0700 |
---|---|---|
committer | Alex S <alex.strizhakov@gmail.com> | 2019-04-02 19:16:29 +0700 |
commit | 9e0567ec5237fc7a2ba37f5291962f3c58fd21f8 (patch) | |
tree | 6caabbf049051d3725662eb765013ee9b844f0cc /priv | |
parent | 484162c18774ff28842a517ae0afcaaf824e12bf (diff) | |
parent | bd961a3badaf7aa7ffc97ab92a6b04367d1c514b (diff) | |
download | pleroma-9e0567ec5237fc7a2ba37f5291962f3c58fd21f8.tar.gz |
Merge develop into feature/770-add-emoji-tags
Diffstat (limited to 'priv')
-rw-r--r-- | priv/static/images/pleroma-fox-tan-smol.png | bin | 0 -> 874668 bytes |
-rw-r--r-- | priv/static/images/pleroma-fox-tan.png | bin | 0 -> 2044257 bytes |
-rw-r--r-- | priv/static/images/pleroma-tan.png | bin | 0 -> 545742 bytes |
3 files changed, 0 insertions, 0 deletions
diff --git a/priv/static/images/pleroma-fox-tan-smol.png b/priv/static/images/pleroma-fox-tan-smol.png Binary files differnew file mode 100644 index 000000000..e944d0e2a --- /dev/null +++ b/priv/static/images/pleroma-fox-tan-smol.png diff --git a/priv/static/images/pleroma-fox-tan.png b/priv/static/images/pleroma-fox-tan.png Binary files differnew file mode 100644 index 000000000..da0022ff2 --- /dev/null +++ b/priv/static/images/pleroma-fox-tan.png diff --git a/priv/static/images/pleroma-tan.png b/priv/static/images/pleroma-tan.png Binary files differnew file mode 100644 index 000000000..6c12c8e46 --- /dev/null +++ b/priv/static/images/pleroma-tan.png |