Marcel Pociot fb958fb851 Merge 2.x changes (#1043) ... * Resolve conflicts * Apply fixes from StyleCI (#1042)		2022-10-06 13:46:54 +02:00
..
Channel.php	Merge 2.x changes (#1043)	2022-10-06 13:46:54 +02:00
PresenceChannel.php	Merge 2.x changes (#1043)	2022-10-06 13:46:54 +02:00
PrivateChannel.php	Apply fixes from StyleCI (#892)	2021-11-26 13:32:47 +01:00