aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2019-04-20 10:23:11 +0200
committerMario Vavti <mario@mariovavti.com>2019-04-20 10:23:11 +0200
commit9275fd16c232ac6c55da345125c240013248e972 (patch)
treeb0cdc1eb3c423aa81ff609f4a3461cdc60fecb09 /Zotlabs/Module
parentfd87faa7a6949f7f44cd4dc6ca866bc072cf444b (diff)
parent904ae058108412de5e068b02cd45d9b8b4e90e4b (diff)
downloadvolse-hubzilla-9275fd16c232ac6c55da345125c240013248e972.tar.gz
volse-hubzilla-9275fd16c232ac6c55da345125c240013248e972.tar.bz2
volse-hubzilla-9275fd16c232ac6c55da345125c240013248e972.zip
resolve merge conflict
Diffstat (limited to 'Zotlabs/Module')
-rw-r--r--Zotlabs/Module/Cdav.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/Zotlabs/Module/Cdav.php b/Zotlabs/Module/Cdav.php
index 85926db8c..cd5cbc61e 100644
--- a/Zotlabs/Module/Cdav.php
+++ b/Zotlabs/Module/Cdav.php
@@ -987,6 +987,7 @@ class Cdav extends Controller {
'$location' => $location,
'$more' => t('More'),
'$less' => t('Less'),
+ '$update' => t('Update'),
'$calendar_select_label' => t('Select calendar'),
'$calendar_optiopns_label' => [t('Channel Calendars'), t('CalDAV Calendars')],
'$delete' => t('Delete'),