Merge branch 'master' into 0.9.x

2010-06-28 15:13:39 -04:00 · 2010-06-28 15:13:39 -04:00 · 83c2e0b379
parent c9863bb864 d87b3f3d2e
commit 83c2e0b379
1 changed files with 1 additions and 0 deletions
--- a/db/notice_source.sql
+++ b/db/notice_source.sql
@ -51,6 +51,7 @@ VALUES
    ('smob','SMOB','http://smob.sioc-project.org/', now()),
    ('socialoomphBfD4pMqz31', 'SocialOomph', 'http://www.socialoomph.com/', now()),
    ('spaz','Spaz','http://funkatron.com/spaz', now()),
+    ('StatusNet Desktop', 'StatusNet Desktop', 'http://status.net/desktop', now()),
    ('tarpipe','tarpipe','http://tarpipe.com/', now()),
    ('tjunar','Tjunar','http://nederflash.nl/boek/titels/tjunar-air', now()),
    ('tr.im','tr.im','http://tr.im/', now()),