Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-05-06 22:24:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/develop' into lemmy

Browse source
This commit is contained in:
Michael 2023-06-18 17:38:39 +00:00
commit 8a50101eea
21 changed files with 203 additions and 182 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/Content/Conversation.php
View file

@ -367,6 +367,7 @@ class Conversation
'$eduline' => $this->l10n->t('Underline'),
'$edquote' => $this->l10n->t('Quote'),
'$edemojis' => $this->l10n->t('Add emojis'),
'$contentwarn' => $this->l10n->t('Content Warning'),
'$edcode' => $this->l10n->t('Code'),
'$edimg' => $this->l10n->t('Image'),
'$edurl' => $this->l10n->t('Link'),