diff options
author | friendica <info@friendica.com> | 2014-07-31 02:35:16 -0700 |
---|---|---|
committer | friendica <info@friendica.com> | 2014-07-31 02:35:16 -0700 |
commit | 56bbf583389eae33b138e81f1e5b3cc71ae41218 (patch) | |
tree | ddbfeae5c10e2d1154bd6979a76bccff22941743 /doc/main.bb | |
parent | 0e57b6cc8c8ad02c06457f96abae3227805c37ef (diff) | |
parent | 28e0e64643dd47c9f6e875afa66a538e3b097cb7 (diff) | |
download | volse-hubzilla-56bbf583389eae33b138e81f1e5b3cc71ae41218.tar.gz volse-hubzilla-56bbf583389eae33b138e81f1e5b3cc71ae41218.tar.bz2 volse-hubzilla-56bbf583389eae33b138e81f1e5b3cc71ae41218.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, 0 insertions, 1 deletions
diff --git a/doc/main.bb b/doc/main.bb index c26075857..d67c18319 100644 --- a/doc/main.bb +++ b/doc/main.bb @@ -20,7 +20,6 @@ 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]Network 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]
|