diff options
| author | habeascodice <habeascodice@federated.social> | 2014-11-01 03:04:11 -0700 |
|---|---|---|
| committer | habeascodice <habeascodice@federated.social> | 2014-11-01 03:04:11 -0700 |
| commit | 31376de0665091f2dba04755562ccd238d57a13c (patch) | |
| tree | ae59c8697b9fd20c33aeaf8acb3a698b63e9657b /doc/channels.bb | |
| parent | c854f8c238da2df08b52249142ad24ef66e422d1 (diff) | |
| parent | 50c16c394fe2d966c62d30930600212a4e33303e (diff) | |
| download | volse-hubzilla-31376de0665091f2dba04755562ccd238d57a13c.tar.gz volse-hubzilla-31376de0665091f2dba04755562ccd238d57a13c.tar.bz2 volse-hubzilla-31376de0665091f2dba04755562ccd238d57a13c.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'doc/channels.bb')
| -rw-r--r-- | doc/channels.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/channels.bb b/doc/channels.bb index 42253a664..82b70630c 100644 --- a/doc/channels.bb +++ b/doc/channels.bb @@ -26,5 +26,5 @@ The "Matrix" page contains all recent posts from across the matrix, ag As mentioned at the start, many other kinds of channel are possible, however, the creation procedure is the same. The difference between channels lies primarily in the permissions assigned. For example, a channel for sharing documents with colleagues at work would probably want more permissive settings for "Can write to my "public" file storage" than a personal account. For more information, see the permissions section.
-Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]
+#include doc/macros/main_footer.bb;
|