diff options
| author | Evan Prodromou <evan@status.net> | 2009-09-23 09:45:22 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-09-23 09:45:22 -0400 |
| commit | 8284b3cb82f4dec6e0f2bf74dea6e1a3bc7f4eac (patch) | |
| tree | 09b8c466df2476f9219550464eb73f6ecaa54e1c /db | |
| parent | 2cabfba767ba0d92d34a6ea4e4cf91c7325f3e95 (diff) | |
| parent | bef4a8b6ba9e19f2ec629031444279ca76f17bcf (diff) | |
Merge branch '0.8.x' into 0.9.x
Conflicts:
actions/requesttoken.php
classes/File.php
install.php
lib/noticeform.php
Diffstat (limited to 'db')
| -rw-r--r-- | db/sms_carrier.sql | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/db/sms_carrier.sql b/db/sms_carrier.sql index 055606f58..0e94df296 100644 --- a/db/sms_carrier.sql +++ b/db/sms_carrier.sql @@ -61,4 +61,5 @@ VALUES (100113, 'T-Mobile Germany', '%s@t-mobile-sms.de', now()), (100114, 'Vodafone Germany', '%s@vodafone-sms.de', now()), (100115, 'E-Plus', '%s@smsmail.eplus.de', now()), - (100116, 'Cellular South', '%s@csouth1.com', now()); + (100116, 'Cellular South', '%s@csouth1.com', now()), + (100117, 'ChinaMobile (139)', '%s@139.com', now()); |