diff options
author | Brion Vibber <brion@pobox.com> | 2010-06-07 10:19:40 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-06-07 10:19:40 -0700 |
commit | d88b208edcb75ec864e09bb3ab29785b35064400 (patch) | |
tree | 6a3b2eb35fb792bffb7ebaf3b4f81fb1131466d1 /db | |
parent | a7e33ac89df9f05b7497bfb34c6e69b3329a87e5 (diff) | |
parent | 41e9dba7297d43b7de0cb7665901869910d1047a (diff) |
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
plugins/OpenID/openid.php
Diffstat (limited to 'db')
-rw-r--r-- | db/notice_source.sql | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/db/notice_source.sql b/db/notice_source.sql index fbcdd6568..5d8664631 100644 --- a/db/notice_source.sql +++ b/db/notice_source.sql @@ -9,6 +9,7 @@ VALUES ('bti','bti','http://gregkh.github.com/bti/', now()), ('choqok', 'Choqok', 'http://choqok.gnufolks.org/', now()), ('cliqset', 'Cliqset', 'http://www.cliqset.com/', now()), + ('DarterosStatus', 'Darteros Status', 'http://www.darteros.com/doc/Darteros_Status', now()), ('deskbar','Deskbar-Applet','http://www.gnome.org/projects/deskbar-applet/', now()), ('Do','Gnome Do','http://do.davebsd.com/wiki/index.php?title=Microblog_Plugin', now()), ('drupal','Drupal','http://drupal.org/', now()), |