From bae3029c639bf6f9469dd93bfedc3dce0d8510d7 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 19 Oct 2014 16:12:05 -0700 Subject: merge madness --- doc/connecting_to_channels.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/connecting_to_channels.bb') diff --git a/doc/connecting_to_channels.bb b/doc/connecting_to_channels.bb index a067b6cf2..901565ad3 100644 --- a/doc/connecting_to_channels.bb +++ b/doc/connecting_to_channels.bb @@ -16,4 +16,4 @@ You may also connect with any channel by visiting the "Connections" pa 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. -Return to the [url=[baseurl]/help/main]Main documentation page[/url] +#include doc/macros/main_footer.bb; -- cgit v1.2.3