diff options
author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-08-23 15:54:46 +0200 |
---|---|---|
committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-08-23 15:54:46 +0200 |
commit | 092e7378cdaeefaa7b4a954bd865bba1960f01aa (patch) | |
tree | 43a01ef991aae0e394d6c0645f84cbc7b856f972 /doc/features.bb | |
parent | e50e68719155c7d35e30bb203a403854f789d5a1 (diff) | |
parent | 2a59392ba8be974a5deec2e6f15959fde21186ea (diff) | |
download | volse-hubzilla-092e7378cdaeefaa7b4a954bd865bba1960f01aa.tar.gz volse-hubzilla-092e7378cdaeefaa7b4a954bd865bba1960f01aa.tar.bz2 volse-hubzilla-092e7378cdaeefaa7b4a954bd865bba1960f01aa.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'doc/features.bb')
-rw-r--r-- | doc/features.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/features.bb b/doc/features.bb index e8d1cd687..0a9bcee38 100644 --- a/doc/features.bb +++ b/doc/features.bb @@ -56,7 +56,7 @@ Store photos in albums. All your photos may be protected by Access Control Lists [b]Events Calendar[/b]
-Create and manage events, which may also be protected with Access Control Lists. Events can be exported to other software using the industry standard vcalendar/iCal format and shared in posts with others. Birthday events are automatically added from your friends and converted to your correct timezone so that you will know precisely when the birthday occurs - no matter where you are located in the world in relation to the birthday person. Events are normally created with attendance counters so your friends and connections can RSVP instantly.
+Create and manage events and tasks, which may also be protected with Access Control Lists. Events can be imported/exported to other software using the industry standard vcalendar/iCal format and shared in posts with others. Birthday events are automatically added from your friends and converted to your correct timezone so that you will know precisely when the birthday occurs - no matter where you are located in the world in relation to the birthday person. Events are normally created with attendance counters so your friends and connections can RSVP instantly.
[b]Chatrooms[/b]
|