summaryrefslogtreecommitdiff
path: root/doc-src/contact
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/contact
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/contact')
-rw-r--r--doc-src/contact4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc-src/contact b/doc-src/contact
index a8efc456a..31f3a4d2b 100644
--- a/doc-src/contact
+++ b/doc-src/contact
@@ -12,8 +12,8 @@ with "@" plus your user name.
Bugs
----
-If you think you've found a bug in the [Laconica](http://laconi.ca/) software,
-or if there's a new feature you'd like to see, add it into the [Laconica bug database](http://laconi.ca/PITS/HomePage). Don't forget to check the list of
+If you think you've found a bug in the [StatusNet](http://status.net/) software,
+or if there's a new feature you'd like to see, add it into the [StatusNet bug database](http://status.net/PITS/HomePage). Don't forget to check the list of
existing bugs to make sure it hasn't already been reported!
Email