diff options
author | Manuel Jiménez Friaza <mjfriaza@openmailbox.org> | 2019-05-19 13:25:00 +0200 |
---|---|---|
committer | Manuel Jiménez Friaza <mjfriaza@openmailbox.org> | 2019-05-19 13:25:00 +0200 |
commit | 429140df97a2c273fba6974147ac2e48e7688263 (patch) | |
tree | 2e337542da1b0f4c9c383dfeb8a7d9eb63990a72 /app | |
parent | f92d2e3f7c6573bd7bab04223c7e28662605c6d8 (diff) | |
parent | af2b263bc74b16601ec7c123a58f0549613aed27 (diff) | |
download | volse-hubzilla-429140df97a2c273fba6974147ac2e48e7688263.tar.gz volse-hubzilla-429140df97a2c273fba6974147ac2e48e7688263.tar.bz2 volse-hubzilla-429140df97a2c273fba6974147ac2e48e7688263.zip |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'app')
-rw-r--r-- | app/calendar.apd (renamed from app/caldav.apd) | 6 | ||||
-rw-r--r-- | app/events.apd | 6 | ||||
-rw-r--r-- | app/events.png | bin | 4118 -> 0 bytes |
3 files changed, 3 insertions, 9 deletions
diff --git a/app/caldav.apd b/app/calendar.apd index 30b45b4bd..8de046e48 100644 --- a/app/caldav.apd +++ b/app/calendar.apd @@ -1,6 +1,6 @@ -version: 2 +version: 1 url: $baseurl/cdav/calendar, $baseurl/settings/calendar requires: local_channel -name: CalDAV +name: Calendar photo: icon:calendar -categories: Productivity, Personal +categories: Productivity, nav_featured_app diff --git a/app/events.apd b/app/events.apd deleted file mode 100644 index b69ee35ee..000000000 --- a/app/events.apd +++ /dev/null @@ -1,6 +0,0 @@ -version: 2 -url: $baseurl/events, $baseurl/settings/events -requires: local_channel -name: Events -photo: icon:calendar -categories: nav_featured_app, Productivity diff --git a/app/events.png b/app/events.png Binary files differdeleted file mode 100644 index a5670fd1e..000000000 --- a/app/events.png +++ /dev/null |