diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-11-06 17:27:25 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-11-06 17:27:25 +0000 |
| commit | 23232e1c8f35d7ddc8adb7a6dbf813b2831c90ec (patch) | |
| tree | b0c8c409d3af0901cb47de648ccbea53da89c16d /docs/assets | |
| parent | b225c3578f3c89af5ed3a0be3f8f3a6bbcedcc7d (diff) | |
| parent | 60983ae42b584694de0211ca67ef72d492a293c9 (diff) | |
Merge branch 'develop' into 'master'
Merge develop into master for 2.2.0
See merge request pleroma/pleroma-fe!1278
Diffstat (limited to 'docs/assets')
| -rw-r--r-- | docs/assets/example_emoji.png | bin | 0 -> 491 bytes |
| -rw-r--r-- | docs/assets/example_markdown.png | bin | 0 -> 16249 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/docs/assets/example_emoji.png b/docs/assets/example_emoji.png Binary files differnew file mode 100644 index 00000000..0a22a256 --- /dev/null +++ b/docs/assets/example_emoji.png diff --git a/docs/assets/example_markdown.png b/docs/assets/example_markdown.png Binary files differnew file mode 100644 index 00000000..3b9df753 --- /dev/null +++ b/docs/assets/example_markdown.png |
