diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-06-08 11:55:32 -0700 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-06-08 11:55:32 -0700 |
| commit | adfb79a9bbdfb43f35c0f022c1de6118b10ce115 (patch) | |
| tree | e14ec0cc5161cfd5cc321eaaa5b8eed07df952de /db | |
| parent | 1a126032efbcb265a59f4d682bd072251f857c97 (diff) | |
| parent | 265e2bd58de2a01e0d7840310eb44b21b70e3914 (diff) | |
Merge branch '0.7.x' into 0.8.x
Conflicts:
classes/Notice.php
classes/Profile.php
lib/common.php
lib/util.php
scripts/getvaliddaemons.php
scripts/stopdaemons.sh
Diffstat (limited to 'db')
| -rw-r--r-- | db/notice_source.sql | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/db/notice_source.sql b/db/notice_source.sql index d5a280b82..983ea9150 100644 --- a/db/notice_source.sql +++ b/db/notice_source.sql @@ -2,7 +2,9 @@ INSERT INTO notice_source (code, name, url, created) VALUES ('adium', 'Adium', 'http://www.adiumx.com/', now()), + ('Afficheur', 'Afficheur', 'http://afficheur.sourceforge.jp/', now()), ('AgentSolo.com','AgentSolo.com','http://www.agentsolo.com/', now()), + ('anyio', 'Any.IO', 'http://any.io/', now()), ('betwittered','BeTwittered','http://www.32hours.com/betwitteredinfo/', now()), ('bti','bti','http://gregkh.github.com/bti/', now()), ('cliqset', 'Cliqset', 'http://www.cliqset.com/', now()), @@ -11,6 +13,7 @@ VALUES ('eventbox','EventBox','http://thecosmicmachine.com/eventbox/ ', now()), ('Facebook','Facebook','http://apps.facebook.com/identica/', now()), ('feed2omb','feed2omb','http://projects.ciarang.com/p/feed2omb/', now()), + ('get2gnow', 'get2gnow', 'http://uberchicgeekchick.com/?projects=get2gnow', now()), ('gravity', 'Gravity', 'http://mobileways.de/gravity', now()), ('Gwibber','Gwibber','http://launchpad.net/gwibber', now()), ('HelloTxt','HelloTxt','http://hellotxt.com/', now()), |