aboutsummaryrefslogtreecommitdiffstats
path: root/include/conversation.php
diff options
context:
space:
mode:
authorRedMatrix <info@friendica.com>2014-04-12 07:20:24 +1000
committerRedMatrix <info@friendica.com>2014-04-12 07:20:24 +1000
commitaa1f5ce7535d4cf17dbdafb4b780a538f35ef05f (patch)
treef56796a4410464c7f4211e2c4d5260a44c944ae1 /include/conversation.php
parent0a871c3f14fb326efa033d89a8e413ad693c1341 (diff)
parent3197ccbf5edf51eab49623c7c21e63af7de7f127 (diff)
downloadvolse-hubzilla-aa1f5ce7535d4cf17dbdafb4b780a538f35ef05f.tar.gz
volse-hubzilla-aa1f5ce7535d4cf17dbdafb4b780a538f35ef05f.tar.bz2
volse-hubzilla-aa1f5ce7535d4cf17dbdafb4b780a538f35ef05f.zip
Merge pull request #404 from git-marijus/master
bootstrapify aclselector
Diffstat (limited to 'include/conversation.php')
-rw-r--r--include/conversation.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 9ffa1e77a..541da1d9b 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1153,7 +1153,7 @@ function status_editor($a,$x,$popup=false) {
'$encrypt' => t('Encrypt text'),
'$cipher' => $cipher,
'$expiryModalOK' => t('OK'),
- '$expiryModalCANCEL' => t('Cancel'),
+ '$expiryModalCANCEL' => t('Cancel')
));