aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-07-05 15:35:05 -0700
committerzotlabs <mike@macgirvin.com>2017-07-05 15:35:05 -0700
commitfca8e0aa6ac9d4f2084371486e906d7e3726a5a5 (patch)
tree81d27ea002828a42c53541f741bad44684a2c601 /app
parent41111bcdadcd16ebc4f078fc812eb5a290f185e5 (diff)
parent8dd9ab05a97f92f9eca5d527e48272f3a44010a8 (diff)
downloadvolse-hubzilla-fca8e0aa6ac9d4f2084371486e906d7e3726a5a5.tar.gz
volse-hubzilla-fca8e0aa6ac9d4f2084371486e906d7e3726a5a5.tar.bz2
volse-hubzilla-fca8e0aa6ac9d4f2084371486e906d7e3726a5a5.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'app')
-rw-r--r--app/caldav.apd6
-rw-r--r--app/carddav.apd6
2 files changed, 12 insertions, 0 deletions
diff --git a/app/caldav.apd b/app/caldav.apd
new file mode 100644
index 000000000..a5839fd6e
--- /dev/null
+++ b/app/caldav.apd
@@ -0,0 +1,6 @@
+version: 1
+url: $baseurl/cdav/calendar
+requires: local_channel
+name: CalDAV
+photo: icon:calendar
+categories: Productivity, Personal
diff --git a/app/carddav.apd b/app/carddav.apd
new file mode 100644
index 000000000..3b60ebcfe
--- /dev/null
+++ b/app/carddav.apd
@@ -0,0 +1,6 @@
+version: 1
+url: $baseurl/cdav/addressbook
+requires: local_channel
+name: CardDAV
+photo: icon:vcard-o
+categories: Productivity, Personal