Commit 830f3762 authored by Shpuld Shpludson's avatar Shpuld Shpludson

Merge branch 'emoji-limit' into 'develop'

compatibility with upcoming changes

See merge request pleroma/pleroma-fe!643
parents 216073eb 68b2d9ef
......@@ -422,6 +422,11 @@ $status-margin: 0.75em;
max-height: 400px;
vertical-align: middle;
object-fit: contain;
&.emoji {
width: 32px;
height: 32px;
}
}
blockquote {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment