diff options
| author | lain <lain@soykaf.club> | 2020-05-16 17:07:09 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-05-16 17:07:09 +0000 |
| commit | d15aa9d9503e59b3cd0731394855781f435ec63c (patch) | |
| tree | 844810415def046a2fc886d0bc1baeb1ff9afb21 /test/instance_static/add | |
| parent | 9cf4c4fa73e68f03791c5cc70505b710be39b677 (diff) | |
| parent | 3bc1138dd9beec03d2336fa1ad45dd23816f5285 (diff) | |
| download | pleroma-d15aa9d9503e59b3cd0731394855781f435ec63c.tar.gz pleroma-d15aa9d9503e59b3cd0731394855781f435ec63c.zip | |
Merge branch 'develop' into 'remove-twitter-api'
# Conflicts:
# lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
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 |
