search

littleredbutton / bigbluebutton-api-php

Unofficial (but better) PHP API for @BigBlueButton
GNU Lesser General Public License v3.0
25 stars 12 forks source link

Sync upstream again #140

Closed FelixJacobi closed 2 years ago

SamuelWei commented 2 years ago

If you compare this PR to the original PR there are some differences. See your own review of the original https://github.com/littleredbutton/bigbluebutton-api-php/pull/126/commits/7d440d6b4d8996b72947b36fd6b250fd223309a2

https://github.com/littleredbutton/bigbluebutton-api-php/pull/126#discussion_r830549194 https://github.com/littleredbutton/bigbluebutton-api-php/pull/126#discussion_r830549199

FelixJacobi commented 2 years ago

Thanks for the spot. You are right. The reason was that I manually needed to reconstruct the branch (GitHub seems to delete no longer referenced commits quickly, so you can't receive them even after a git fetch :/ ) from an outdated copy that was left had locally on my machine and I missed re-applying this.

I will create a regular PR as a fixup as this is only a cosmetic thing ^^ .

SamuelWei commented 2 years ago

Wouldn't it have been possible to restore the old branch and just merge again without stashing?

FelixJacobi commented 2 years ago

Ah, yes. You are right. The button was quite hidden in the history of the original PR (next to the deleted branch message). See #141 for the rest of the changes.