diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-05-18 13:37:38 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-05-18 13:37:38 +0300 |
| commit | 5ece901af3e887664653c79c5e61618cc5cf0ecf (patch) | |
| tree | 93fc7c3bdb70348d5ef91fa9f7db3293b17f9854 /priv/static | |
| parent | fd920c897339b9cedea042dd6698d14380cedae7 (diff) | |
| parent | 8e9a764dfcde315afd055c8e63543bfca24cc41b (diff) | |
| download | pleroma-5ece901af3e887664653c79c5e61618cc5cf0ecf.tar.gz pleroma-5ece901af3e887664653c79c5e61618cc5cf0ecf.zip | |
Resolve merge conflicts and remove IO.inspects
Diffstat (limited to 'priv/static')
| -rw-r--r-- | priv/static/images/pleroma-fox-tan-shy.png | bin | 0 -> 1038613 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/priv/static/images/pleroma-fox-tan-shy.png b/priv/static/images/pleroma-fox-tan-shy.png Binary files differnew file mode 100644 index 000000000..6e24be1e3 --- /dev/null +++ b/priv/static/images/pleroma-fox-tan-shy.png |
