aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-04-03 11:35:06 +0200
committerMario Vavti <mario@mariovavti.com>2016-04-03 11:35:06 +0200
commitb6f18a9a0b044339e334139284294a246ab245ad (patch)
tree069099434667defba70d1fa8ca13bcfc95b6763e /mod
parent2772a7209594bf239200e81e48d997d49dea2daf (diff)
parentb8d8be701382b72b3556ff9a3d67aabfc85223f5 (diff)
downloadvolse-hubzilla-b6f18a9a0b044339e334139284294a246ab245ad.tar.gz
volse-hubzilla-b6f18a9a0b044339e334139284294a246ab245ad.tar.bz2
volse-hubzilla-b6f18a9a0b044339e334139284294a246ab245ad.zip
Merge branch 'master' into dev
Diffstat (limited to 'mod')
-rw-r--r--mod/chat.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/mod/chat.php b/mod/chat.php
index 211846964..75c364008 100644
--- a/mod/chat.php
+++ b/mod/chat.php
@@ -240,6 +240,8 @@ function chat_content(&$a) {
'$newroom' => t('Create New'),
'$is_owner' => ((local_channel() && local_channel() == App::$profile['profile_uid']) ? 1 : 0),
'$chatroom_new' => $chatroom_new,
+ '$expire' => t('Expiration'),
+ '$expire_unit' => t('min') //minutes
));
return $o;