diff options
| author | friendica <info@friendica.com> | 2014-12-10 16:26:36 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-12-10 16:26:36 -0800 |
| commit | 7f1a42340a3f0967e23cf836b2c417a1b9b9b20b (patch) | |
| tree | 27627ee92feb7ac5c16fcb1214f0819d2f68c653 /doc/connecting_to_channels.md | |
| parent | 58067c24fc5200993539af6d7f7254877662c3c9 (diff) | |
| parent | c91aa863d85e6d3b3a260fefe5e281d66730c4c9 (diff) | |
| download | volse-hubzilla-7f1a42340a3f0967e23cf836b2c417a1b9b9b20b.tar.gz volse-hubzilla-7f1a42340a3f0967e23cf836b2c417a1b9b9b20b.tar.bz2 volse-hubzilla-7f1a42340a3f0967e23cf836b2c417a1b9b9b20b.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'doc/connecting_to_channels.md')
| -rw-r--r-- | doc/connecting_to_channels.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/connecting_to_channels.md b/doc/connecting_to_channels.md index 8a7b0bdde..1e0d4d3fc 100644 --- a/doc/connecting_to_channels.md +++ b/doc/connecting_to_channels.md @@ -31,3 +31,4 @@ Here's their meaning: Some channels are designated "Premium Channels" and **may** require some action on your part before a connection can be established. The Connect button will for these channels will take you to a page which lists in detail what terms the channel owner has set. If the terms are accepted, the connection will then proceed normally. In some cases, such as with celebrities and world-reknowned publishers, this **may** involve payment. If you do not agree to the terms, the connection will not proceed, or it may proceed but with reduced permissions allowed on your interactions with that channel. +#include doc/macros/main_footer.bb; |