Merge branch 'master' of https://github.com/friendica/friendica into threaded_items

This commit is contained in:
Domovoy 2012-07-30 13:36:33 +02:00
commit 07f87848b4
8 changed files with 977 additions and 685 deletions

View file

@ -1486,6 +1486,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
'$bang' => $x['bang'],
'$profile_uid' => $x['profile_uid'],
'$preview' => t('Preview'),
'$mobileapp' => t('Friendica mobile web'),
));