Merge branch 'master' into devel
Conflicts: classes/CommandInterpreter.php lib/twitter.php lib/util.php
This commit is contained in:
commit
02877224b2
@ -105,6 +105,7 @@ class CommandInterpreter
|
|||||||
return new GetCommand($user, $other);
|
return new GetCommand($user, $other);
|
||||||
}
|
}
|
||||||
case 'd':
|
case 'd':
|
||||||
|
case 'dm':
|
||||||
if (!$arg) {
|
if (!$arg) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user