diff options
| author | Brion Vibber <brion@pobox.com> | 2010-10-04 12:54:36 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-10-04 12:54:36 -0700 |
| commit | 59119482ca34540bd7f0a2a1aa994de1d5328ea2 (patch) | |
| tree | 864fdc9dda3da54a78d868339c32479b5296b6d0 /db | |
| parent | 2db8aa3ec3f6804f8f16efe754aafb149f4035c9 (diff) | |
| parent | 1652ded48c9c62c40157a5142e5231adbc574ddb (diff) | |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
actions/hostmeta.php
actions/imsettings.php
classes/User.php
lib/adminpanelaction.php
lib/channel.php
lib/default.php
lib/router.php
lib/util.php
Diffstat (limited to 'db')
| -rw-r--r-- | db/notice_source.sql | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/db/notice_source.sql b/db/notice_source.sql index 6bfd5c5f1..04d9d7ba6 100644 --- a/db/notice_source.sql +++ b/db/notice_source.sql @@ -52,6 +52,10 @@ VALUES ('socialoomphBfD4pMqz31', 'SocialOomph', 'http://www.socialoomph.com/', now()), ('spaz','Spaz','http://funkatron.com/spaz', now()), ('StatusNet Desktop', 'StatusNet Desktop', 'http://status.net/desktop', now()), + ('StatusNet Mobile', 'StatusNet Mobile', 'http://status.net/mobile', now()), + ('StatusNet iPhone', 'iPhone', 'http://status.net/iphone', now()), + ('StatusNet Android', 'Android', 'http://status.net/android', now()), + ('StatusNet Blackberry', 'Blackberry', 'http://status.net/blackberry', 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()), |