diff options
author | Evan Prodromou <evan@status.net> | 2009-08-27 11:16:45 -0700 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2009-08-27 11:16:45 -0700 |
commit | 5d09b6b3f0595540c66b703ae085f0af904fe30f (patch) | |
tree | 59269a4dacf90bbab9f0ff63afff4bf1781a1240 /doc-src/about | |
parent | f1fda6c0503e32edfc99b297f4bf2cb07e629d9e (diff) | |
parent | 82b0927f5838f3c12816e03712df9460a9f77b72 (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/about')
-rw-r--r-- | doc-src/about | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc-src/about b/doc-src/about index 3036a51b9..21f4dbf15 100644 --- a/doc-src/about +++ b/doc-src/about @@ -1,6 +1,6 @@ %%site.name%% is a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service -based on the Free Software [Laconica](http://laconi.ca/) tool. +based on the Free Software [StatusNet](http://status.net/) tool. If you [register](%%action.register%%) for an account, you can post small (140 chars or less) text notices |