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

2012-07-30 13:36:33 +02:00
parent 30d7db5e42 9b752b8a59
commit 07f87848b4
8 changed files with 977 additions and 685 deletions
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -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'),
 	));