Merge branch '5.2' into 5.x
* 5.2: Fix merge
This commit is contained in:
commit
92f814967d
@ -87,11 +87,6 @@ final class MattermostTransport extends AbstractTransport
|
|||||||
return $sentMessage;
|
return $sentMessage;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function getEndpoint(): ?string
|
|
||||||
{
|
|
||||||
return $this->host.($this->port ? ':'.$this->port : '');
|
|
||||||
}
|
|
||||||
|
|
||||||
protected function getEndpoint(): ?string
|
protected function getEndpoint(): ?string
|
||||||
{
|
{
|
||||||
return rtrim($this->host.($this->port ? ':'.$this->port : '').($this->path ?? ''), '/');
|
return rtrim($this->host.($this->port ? ':'.$this->port : '').($this->path ?? ''), '/');
|
||||||
|
Reference in New Issue
Block a user