diff options
author | friendica <info@friendica.com> | 2014-07-06 19:15:32 -0700 |
---|---|---|
committer | friendica <info@friendica.com> | 2014-07-06 19:15:32 -0700 |
commit | 9714ef5db9eb8b5c38ac895b23cff095a1c64cab (patch) | |
tree | 6d78bc682eaee458cbc1d3e8dc89a6a4f6173347 /doc/main.bb | |
parent | 5f4181384543a3fda7fd0101f0cbc7100584d323 (diff) | |
parent | 7317e2bad240f80d0630e1c96acff2a9d5f9b037 (diff) | |
download | volse-hubzilla-9714ef5db9eb8b5c38ac895b23cff095a1c64cab.tar.gz volse-hubzilla-9714ef5db9eb8b5c38ac895b23cff095a1c64cab.tar.bz2 volse-hubzilla-9714ef5db9eb8b5c38ac895b23cff095a1c64cab.zip |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'doc/main.bb')
-rw-r--r-- | doc/main.bb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/main.bb b/doc/main.bb index 370f15447..99d5918be 100644 --- a/doc/main.bb +++ b/doc/main.bb @@ -19,6 +19,7 @@ Zot is the great new communicaton protocol invented especially for the Red Matri [zrl=[baseurl]/help/channels]Channels[/zrl]
[zrl=[baseurl]/help/first-post]Your first posting[/zrl]
[zrl=[baseurl]/help/connecting_to_channels]Connecting To Other Channels[/zrl]
+[zrl=[baseurl]/help/privacy]Privacy[/zrl] [zrl=[baseurl]/help/permissions]Permissions And Encryption: You Are In Control[/zrl]
[zrl=[baseurl]/help/cloud]Cloud Storage[/zrl]
[zrl=[baseurl]/help/remove_account]Remove Account[/zrl]
|