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/faq | |
| 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/faq')
| -rw-r--r-- | doc-src/faq | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc-src/faq b/doc-src/faq index 31582b9f0..6aadd2e60 100644 --- a/doc-src/faq +++ b/doc-src/faq @@ -26,7 +26,7 @@ presence. If you don't like how %%site.name%% works, you can take your data and Where is feature X? ------------------- -The software we run, [Laconica](http://laconi.ca/), is still in its early stages, +The software we run, [StatusNet](http://status.net/), is still in its early stages, and many features people expect from microblogging sites are not yet implemented. Some important ones that are expected "soon": * More [AJAX](http://en.wikipedia.org/wiki/AJAX)-y interface @@ -36,7 +36,7 @@ and many features people expect from microblogging sites are not yet implemented * [Facebook](http://www.facebook.com/) integration * Image, video, audio notices -There is [a list of bugs and features](http://laconi.ca/trac/) that you may find +There is [a list of bugs and features](http://status.net/trac/) that you may find interesting. New ideas or complaints are very welcome. |