diff options
| author | Zach Copley <zach@controlyourself.ca> | 2009-09-08 16:02:57 -0700 |
|---|---|---|
| committer | Zach Copley <zach@controlyourself.ca> | 2009-09-08 16:02:57 -0700 |
| commit | 9d87313eaebe8240393ac300a435f3b1332c8849 (patch) | |
| tree | 6b7e7d69c63fc6801ad95477be9c11ccb7cd0a1a /doc-src/openmublog | |
| parent | 5efe588174c71979fc1970353c9a556ea441f138 (diff) | |
| parent | beae3db41375879e725af053edf8041bbd76ac8c (diff) | |
Merge branch '0.9.x' into pluginize-twitter-bridge
Conflicts:
plugins/TwitterBridge/twitterauthorization.php
Diffstat (limited to 'doc-src/openmublog')
| -rw-r--r-- | doc-src/openmublog | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc-src/openmublog b/doc-src/openmublog index 6e3abee42..aec532b79 100644 --- a/doc-src/openmublog +++ b/doc-src/openmublog @@ -4,8 +4,8 @@ subscribe to notices by users of another service. The protocol, based on [OAuth](http://oauth.net/), is open and free, and doesn't depend on any central authority to maintain the federated microblogs. -The [Laconica](http://laconi.ca/) software that runs %%site.name%% supports -OpenMicroBlogging 0.1. Anyone can make a new installation of Laconica on their +The [StatusNet](http://status.net/) software that runs %%site.name%% supports +OpenMicroBlogging 0.1. Anyone can make a new installation of StatusNet on their own servers, and users of that new installation can subscribe to notices from %%site.name%%. |