diff options
| author | Sarven Capadisli <csarven@controlyourself.ca> | 2009-05-01 00:16:25 +0000 |
|---|---|---|
| committer | Sarven Capadisli <csarven@controlyourself.ca> | 2009-05-01 00:16:25 +0000 |
| commit | d30df0790818d77b81ee8b271b9bd8ebe3063ee7 (patch) | |
| tree | d3a9b32815252caabcf16f593fbf4e2080cff93f /db/notice_source.sql | |
| parent | f798d1ea430d25c2f4a60179c65b39b1257a5340 (diff) | |
| parent | b79fef307481b36b4d04dbabb54e3f6d9edf6896 (diff) | |
Merge branch '0.7.x' into 0.8.x
Resolved Conflicts:
lib/queuehandler.php
lib/util.php
theme/base/css/display.css
Diffstat (limited to 'db/notice_source.sql')
| -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 d5124e223..ce44f3235 100644 --- a/db/notice_source.sql +++ b/db/notice_source.sql @@ -8,6 +8,7 @@ VALUES ('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()), ('Facebook','Facebook','http://apps.facebook.com/identica/', now()), + ('feed2omb','feed2omb','http://projects.ciarang.com/p/feed2omb/', now()), ('Gwibber','Gwibber','http://launchpad.net/gwibber', now()), ('HelloTxt','HelloTxt','http://hellotxt.com/', now()), ('identicatools','Laconica Tools','http://bitbucketlabs.net/laconica-tools/', now()), |