aboutsummaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2011-02-28 15:39:43 -0800
committerZach Copley <zach@status.net>2011-02-28 15:39:43 -0800
commitb7d07466943a73e1c009467c8daa6e499810080f (patch)
tree95842ead62b631eb2d6f544939f29074dd6eb614 /db
parentbabdc430f93a5efb17db4df0518f690d81f758d7 (diff)
parent061c8d959ba8351b145a27690d5a4caa477915ca (diff)
downloadgnu-social-b7d07466943a73e1c009467c8daa6e499810080f.tar
gnu-social-b7d07466943a73e1c009467c8daa6e499810080f.zip
Merge branch '0.9.x' into 1.0.x
Conflicts: actions/confirmaddress.php actions/emailsettings.php actions/hostmeta.php actions/imsettings.php actions/login.php actions/profilesettings.php actions/showgroup.php actions/smssettings.php actions/urlsettings.php actions/userauthorization.php actions/userdesignsettings.php classes/Memcached_DataObject.php index.php lib/accountsettingsaction.php lib/action.php lib/common.php lib/connectsettingsaction.php lib/designsettings.php lib/personalgroupnav.php lib/profileaction.php lib/userprofile.php plugins/ClientSideShorten/ClientSideShortenPlugin.php plugins/Facebook/FBConnectSettings.php plugins/Facebook/FacebookPlugin.php plugins/NewMenu/NewMenuPlugin.php plugins/NewMenu/newmenu.css
Diffstat (limited to 'db')
-rw-r--r--db/notice_source.sql4
1 files changed, 3 insertions, 1 deletions
diff --git a/db/notice_source.sql b/db/notice_source.sql
index 82074077b4..dec8080a01 100644
--- a/db/notice_source.sql
+++ b/db/notice_source.sql
@@ -24,6 +24,7 @@ VALUES
('HelloTxt','HelloTxt','http://hellotxt.com/', now()),
('identicatools','Laconica Tools','http://bitbucketlabs.net/laconica-tools/', now()),
('identichat','identichat','http://identichat.prosody.im/', now()),
+ ('IdentiCurse','IdentiCurse','http://identicurse.net/', now()),
('IdentiFox','IdentiFox','http://www.bitbucket.org/uncryptic/identifox/', now()),
('identitwitch','IdentiTwitch','http://richfish.org/identitwitch/', now()),
('Jiminy','Jiminy','http://code.google.com/p/jiminy/', now()),
@@ -77,4 +78,5 @@ VALUES
('twitvim','TwitVim','http://vim.sourceforge.net/scripts/script.php?script_id=2204', now()),
('Updating.Me','Updating.Me','http://updating.me/', now()),
('urfastr','urfastr','http://urfastr.net/', now()),
- ('yatca','Yatca','http://www.yatca.com/', now());
+ ('yatca','Yatca','http://www.yatca.com/', now()),
+ ('rss.me', 'rss.me', 'http://rss.me/', now());