diff options
| author | friendica <info@friendica.com> | 2015-03-11 19:35:23 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-03-11 19:35:23 -0700 |
| commit | 64ae17aa6a1bdbc3933422272a391d4e3662f59b (patch) | |
| tree | b87f4c0866d9ecfa832d43b7e622e3100386a408 /include/conversation.php | |
| parent | a40c19d19d31bba3fe037a9778c521461e2b0290 (diff) | |
| parent | b3a9a6c802170a15cc58fd3af966b35f81c50818 (diff) | |
| download | volse-hubzilla-64ae17aa6a1bdbc3933422272a391d4e3662f59b.tar.gz volse-hubzilla-64ae17aa6a1bdbc3933422272a391d4e3662f59b.tar.bz2 volse-hubzilla-64ae17aa6a1bdbc3933422272a391d4e3662f59b.zip | |
Merge branch 'master' into openid
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/conversation.php b/include/conversation.php index bc1883efc..0e35202fa 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1173,6 +1173,11 @@ function status_editor($a, $x, $popup = false) { '$id_select' => $id_select, '$id_seltext' => t('Post as'), '$writephoto' => perm_is_allowed($x['profile_uid'], get_observer_hash(), 'post_photos'), + '$bold' => t('Bold'), + '$italic' => t('Italic'), + '$underline' => t('Underline'), + '$quote' => t('Quote'), + '$code' => t('Code'), '$upload' => t('Upload photo'), '$shortupload' => t('upload photo'), '$attach' => t('Attach file'), |