diff options
author | Zach Copley <zach@controlyourself.ca> | 2009-08-10 07:49:51 +0000 |
---|---|---|
committer | Zach Copley <zach@controlyourself.ca> | 2009-08-10 07:49:51 +0000 |
commit | 17dcf1c3170bc905e3b0fdffc804d6f7229ac61b (patch) | |
tree | 6a236c91314d3576b19493e42a9773a7610cce69 /scripts/stopdaemons.sh | |
parent | c1b19929f6234c4b9e30e16bae419c89c38c1169 (diff) | |
parent | 06c5f490ea509f3a5222f42ee561c9b4f337af8e (diff) |
Merge branch 'twitter-oauth' into 0.8.x
Conflicts:
scripts/getvaliddaemons.php
Diffstat (limited to 'scripts/stopdaemons.sh')
-rwxr-xr-x | scripts/stopdaemons.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/stopdaemons.sh b/scripts/stopdaemons.sh index 60ffd83ad..894e5aaff 100755 --- a/scripts/stopdaemons.sh +++ b/scripts/stopdaemons.sh @@ -25,7 +25,7 @@ DIR=`php $SDIR/getpiddir.php` for f in jabberhandler ombhandler publichandler smshandler pinghandler \ xmppconfirmhandler xmppdaemon twitterhandler facebookhandler \ - twitterstatusfetcher; do + twitterstatusfetcher synctwitterfriends; do FILES="$DIR/$f.*.pid" for ff in "$FILES" ; do |