diff options
| author | kaniini <nenolod@gmail.com> | 2018-09-03 05:54:11 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-09-03 05:54:11 +0000 |
| commit | 7ca2a2ddeaa4396c86cd39a43a8fd0a4c8d3ce14 (patch) | |
| tree | c70c18e097045c329b53c2d1de8981bcd5f7b3c0 /priv/static/instance/panel.html | |
| parent | 072e965015698a3198242aad3ad969a696b8f03e (diff) | |
| parent | 4257f784bc8e742888e978fccbab0f566c549376 (diff) | |
| download | pleroma-7ca2a2ddeaa4396c86cd39a43a8fd0a4c8d3ce14.tar.gz pleroma-7ca2a2ddeaa4396c86cd39a43a8fd0a4c8d3ce14.zip | |
Merge branch 'nil-bio-emojis' into 'develop'
add nil clause for Formatter.get_emoji/1 to return an empty result
Closes #274
See merge request pleroma/pleroma!315
Diffstat (limited to 'priv/static/instance/panel.html')
0 files changed, 0 insertions, 0 deletions