diff options
author | Evan Prodromou <evan@status.net> | 2009-11-10 14:26:49 -0500 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2009-11-10 14:26:49 -0500 |
commit | 7ae10c27b0725a7108b63a788affd4d07e37afdc (patch) | |
tree | 92f952319071ba770136d3e69a82e51040ecb6b5 /plugins/TwitterBridge/twitter.php | |
parent | 8d5c2b3129a1d7cefd78e311d5cbbe9ab426bb72 (diff) | |
parent | 737fe763471bcb6ebd95c318363308a33e28e889 (diff) |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
lib/util.php
Diffstat (limited to 'plugins/TwitterBridge/twitter.php')
-rw-r--r-- | plugins/TwitterBridge/twitter.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/TwitterBridge/twitter.php b/plugins/TwitterBridge/twitter.php index d48089caa..3c6803e49 100644 --- a/plugins/TwitterBridge/twitter.php +++ b/plugins/TwitterBridge/twitter.php @@ -33,7 +33,7 @@ function updateTwitter_user($twitter_id, $screen_name) $fuser->query('BEGIN'); - // Dropping down to SQL because regular DB_DataObject udpate stuff does not seem + // Dropping down to SQL because regular DB_DataObject udpate stuff doesn't seem // to work so good with tables that have multiple column primary keys // Any time we update the uri for a forein user we have to make sure there |