aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-04-03 16:17:31 -0700
committerredmatrix <git@macgirvin.com>2016-04-03 16:17:31 -0700
commitcfad5ba8b8baf843ea02bbb5eadd78f3bf845136 (patch)
treea0b9c107b2d0121b5268d95e3f3d9bffdc72c9c5 /mod
parent84feff9500db2b66c977749e0c5b777259031783 (diff)
parentb4c1baada1fba46d4d75f40a7e78111d70d54e7a (diff)
downloadvolse-hubzilla-cfad5ba8b8baf843ea02bbb5eadd78f3bf845136.tar.gz
volse-hubzilla-cfad5ba8b8baf843ea02bbb5eadd78f3bf845136.tar.bz2
volse-hubzilla-cfad5ba8b8baf843ea02bbb5eadd78f3bf845136.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;