diff options
author | Maksim Pechnikov <parallel588@gmail.com> | 2020-05-01 06:21:59 +0300 |
---|---|---|
committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-05-01 06:21:59 +0300 |
commit | a92c713d9c761563c72d0f660574878aa569249a (patch) | |
tree | ce88697749dbe26331b255883b4fa9631002e8b4 /test/instance_static/add | |
parent | 270c3fe446a374202b6d64ce487f7df29ecb1c14 (diff) | |
parent | 0dd863f8f53d30d37e35d4ec2c4e34d09a266a85 (diff) | |
download | pleroma-a92c713d9c761563c72d0f660574878aa569249a.tar.gz pleroma-a92c713d9c761563c72d0f660574878aa569249a.zip |
Merge branch 'develop' into issue/1276-2
Diffstat (limited to 'test/instance_static/add')
-rw-r--r-- | test/instance_static/add/shortcode.png | bin | 0 -> 95 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/test/instance_static/add/shortcode.png b/test/instance_static/add/shortcode.png Binary files differnew file mode 100644 index 000000000..8f50fa023 --- /dev/null +++ b/test/instance_static/add/shortcode.png |