diff options
| author | Craig Andrews <candrews@integralblue.com> | 2010-03-08 17:22:23 -0500 |
|---|---|---|
| committer | Craig Andrews <candrews@integralblue.com> | 2010-03-08 17:22:23 -0500 |
| commit | 714d920faea302b55857cc3bec4e9e6160ea136a (patch) | |
| tree | cffa5ee7a3261ad24b272cb3ced16a6c1dcafad1 /actions/apigrouplist.php | |
| parent | c187bf55974347f7ddb4f28714af57861dce8f08 (diff) | |
| parent | 51a245f18c1e4a830c5eb94f3e60c6b4b3e560ee (diff) | |
Merge branch '0.9.x' into 1.0.x
Conflicts:
classes/statusnet.ini
db/statusnet.sql
lib/jabber.php
lib/xmppmanager.php
Diffstat (limited to 'actions/apigrouplist.php')
| -rw-r--r-- | actions/apigrouplist.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/actions/apigrouplist.php b/actions/apigrouplist.php index 605b38232..98fdb0497 100644 --- a/actions/apigrouplist.php +++ b/actions/apigrouplist.php @@ -152,8 +152,7 @@ class ApiGroupListAction extends ApiBareAuthAction ($this->page - 1) * $this->count, $this->count, $this->since_id, - $this->max_id, - $this->since + $this->max_id ); while ($group->fetch()) { |