diff options
| author | lain <lain@soykaf.club> | 2019-04-08 14:10:51 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-04-08 14:10:51 +0200 |
| commit | a9f805c87100fd2ee1d8426460b81af4a235d574 (patch) | |
| tree | 70179175f0ff84f3f4c7399f63694766aaa65b35 /priv/static | |
| parent | 5d871173d189a0019fda0ee76f8a324d90a163ee (diff) | |
| parent | 4977e96fa408e8148a355b3c759af34ae3ca312d (diff) | |
| download | pleroma-a9f805c87100fd2ee1d8426460b81af4a235d574.tar.gz pleroma-a9f805c87100fd2ee1d8426460b81af4a235d574.zip | |
Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations
Diffstat (limited to 'priv/static')
| -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 |
