summaryrefslogtreecommitdiff
path: root/doc-src/groups
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-08-27 11:16:45 -0700
committerEvan Prodromou <evan@status.net>2009-08-27 11:16:45 -0700
commit5d09b6b3f0595540c66b703ae085f0af904fe30f (patch)
tree59269a4dacf90bbab9f0ff63afff4bf1781a1240 /doc-src/groups
parentf1fda6c0503e32edfc99b297f4bf2cb07e629d9e (diff)
parent82b0927f5838f3c12816e03712df9460a9f77b72 (diff)
Merge branch '0.8.x' into 0.9.x
Conflicts: EVENTS.txt actions/finishremotesubscribe.php actions/postnotice.php actions/public.php actions/remotesubscribe.php actions/showstream.php actions/updateprofile.php actions/userauthorization.php classes/laconica.ini lib/common.php lib/oauthstore.php lib/omb.php
Diffstat (limited to 'doc-src/groups')
-rw-r--r--doc-src/groups2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc-src/groups b/doc-src/groups
index 645390e0c..772ca9833 100644
--- a/doc-src/groups
+++ b/doc-src/groups
@@ -38,5 +38,5 @@ your phone or IM client if you've set them up to receive notices.
Remote groups
-------------
-While it's technically possible, this version of Laconica does not
+While it's technically possible, this version of StatusNet does not
support remote group membership.